Skip to content

Commit

Permalink
Update references from kubernetes-ingress-controller -> ngrok-operator (
Browse files Browse the repository at this point in the history
#426)

* chore(rename): Replace kubernetes-ingress-controller with ngrok-operator

rg github.com/ngrok/kubernetes-ingress-controller . --files-with-matches | xargs sed -i 's/github.com\/ngrok\/kubernetes-ingress-controller/github.com\/ngrok\/ngrok-operator/g'

* chore(rename): Move helm/ingress-controller -> helm/ngrok-operator

* chore(rename): More updates
  • Loading branch information
jonstacks authored Sep 10, 2024
1 parent fe00f2e commit 1e2367d
Show file tree
Hide file tree
Showing 121 changed files with 3,136 additions and 750 deletions.
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ PROJECT linguist-generated=true
api/v1alpha1/zz_generated.deepcopy.go linguist-generated=true

# These files are generated by kubebuilder. See Makefile for details.
helm/ingress-controller/templates/crds/** linguist-generated=true
helm/ingress-controller/templates/rbac/role.yaml linguist-generated=true
helm/ngrok-operator/templates/crds/** linguist-generated=true
helm/ngrok-operator/templates/rbac/role.yaml linguist-generated=true
manifest-bundle.yaml linguist-generated=true
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/controller_bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body:
Thanks for taking the time to fill out this bug report!
Note, you do not need to create an issue if you have a change ready to submit.
You can open a [pull request](https://github.com/ngrok/kubernetes-ingress-controller/pulls) immediately instead.
You can open a [pull request](https://github.com/ngrok/ngrok-operator/pulls) immediately instead.
- type: input
attributes:
label: Kubernetes Version
Expand Down Expand Up @@ -41,7 +41,7 @@ body:
label: Kubernetes Logs
description: We want to see relevant kubernetes logs showing error messages or helpful debugging information
placeholder: >
Run `kubectl logs -l app.kubernetes.io/name=kubernetes-ingress-controller` and copy the output here.
Run `kubectl logs -l app.kubernetes.io/name=ngrok-operator` and copy the output here.
validations:
required: true
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/helm_bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body:
Thanks for taking the time to fill out this bug report!
Note, you do not need to create an issue if you have a change ready to submit.
You can open a [pull request](https://github.com/ngrok/kubernetes-ingress-controller/pulls) immediately instead.
You can open a [pull request](https://github.com/ngrok/ngrok-operator/pulls) immediately instead.
- type: input
attributes:
label: Kubernetes Version
Expand Down
2 changes: 1 addition & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ area/helm-chart:
area/release:
- docs/releases.md
- VERSION
- helm/ingress-controller/Chart.yaml
- helm/ngrok-operator/Chart.yaml

documentation:
- docs/**/*
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
with:
filters: |
chartyaml:
- 'helm/ingress-controller/Chart.yaml'
- 'helm/ngrok-operator/Chart.yaml'
charts:
- 'helm/ingress-controller/**'
- 'helm/ngrok-operator/**'
- 'scripts/e2e.sh'
go:
- '**.go'
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
context: .
platforms: ${{ steps.buildx-setup.outputs.platforms }}
push: false
tags: ngrok/kubernetes-ingress-controller:latest
tags: ngrok/ngrok-operator:latest

go-mod-tidy:
name: Go Mod Tidy Check
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
permissions:
contents: read
pull-requests: read
if: github.repository == 'ngrok/kubernetes-ingress-controller'
if: github.repository == 'ngrok/ngrok-operator'
steps:
- name: Checkout repo
uses: actions/checkout@v3
Expand All @@ -39,7 +39,7 @@ jobs:
needs:
- changes
if: |
github.repository == 'ngrok/kubernetes-ingress-controller' &&
github.repository == 'ngrok/ngrok-operator' &&
github.event_name == 'push' &&
github.ref == 'refs/heads/main'
steps:
Expand Down Expand Up @@ -67,15 +67,15 @@ jobs:
context: .
platforms: ${{ steps.buildx-setup.outputs.platforms }}
push: true
tags: ngrok/kubernetes-ingress-controller:latest
tags: ngrok/ngrok-operator:latest
- name: Build and push tag'd docker image
uses: docker/build-push-action@v3
if: ${{ needs.changes.outputs.tag == 'true' }}
with:
context: .
platforms: ${{ steps.buildx-setup.outputs.platforms }}
push: true
tags: ngrok/kubernetes-ingress-controller:${{ steps.extract_tag.outputs.tag }}
tags: ngrok/ngrok-operator:${{ steps.extract_tag.outputs.tag }}
- name: Create GitHub Release
uses: actions/github-script@v6
if: ${{ needs.changes.outputs.tag == 'true' }}
Expand All @@ -86,8 +86,8 @@ jobs:
const release = await github.rest.repos.createRelease({
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: `kubernetes-ingress-controller-${tag}`,
name: `kubernetes-ingress-controller-${tag}`,
tag_name: `ngrok-operator-${tag}`,
name: `ngrok-operator-${tag}`,
body: `${tag}`,
draft: false,
prerelease: false
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/generate-chart-readme.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,8 @@ jobs:
repository: ${{github.event.pull_request.head.repo.full_name}}
token: ${{ secrets.GITHUB_TOKEN }}
- name: Execute readme-generator-for-helm
working-directory: helm/ingress-controller
working-directory: helm/ngrok-operator
run: |
# Using the Github API to detect the files changed as git merge-base stops working when the branch is behind
# and jitterbit/get-changed-files does not support pull_request_target
URL="https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files"
files_changed_data=$(curl -s --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' -X GET -G "$URL")
files_changed="$(echo $files_changed_data | jq -r '.[] | .filename')"
readme-generator --values "values.yaml" --readme "README.md" --schema "/tmp/schema.json"
- name: Push changes
uses: stefanzweifel/git-auto-commit-action@v4
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/generate-full-install-manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: 'Generate full install manifests'

on:
push:
# TODO(operator-rename): Change this to main at some point so that we update the manifest bundle.
# This will need to be run post-release.
branches:
- alex/single-manifest-file
# paths:
Expand Down Expand Up @@ -31,9 +33,9 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Run helm template
run: |
helm template ingress-controller helm/ingress-controller \
-n ngrok-ingress-controller \
--set credentials.secret.name="ngrok-ingress-controller-credentials" > manifest-bundle.yaml
helm template ngrok-operator helm/ngrok-operator \
-n ngrok-operator \
--set credentials.secret.name="ngrok-operator-credentials" > manifest-bundle.yaml
- name: Push changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/helm_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- main
paths:
- 'helm/ingress-controller/Chart.yaml'
- 'helm/ngrok-operator/Chart.yaml'

jobs:
changes:
Expand All @@ -17,6 +17,7 @@ jobs:
permissions:
contents: read
pull-requests: read
# TODO(operator-rename): Change this to ngrok/ngrok-operator when we are ready to release the helm chart
if: github.repository == 'ngrok/kubernetes-ingress-controller'
steps:
- name: Checkout repo
Expand All @@ -27,7 +28,7 @@ jobs:
with:
filters: |
charts:
- 'helm/ingress-controller/Chart.yaml'
- 'helm/ngrok-operator/Chart.yaml'
chart:
name: Release Chart
Expand All @@ -36,6 +37,7 @@ jobs:
permissions:
contents: write # need to write releases
needs: [changes]
# TODO(operator-rename): Change this to ngrok/ngrok-operator when we are ready to release the helm chart
if: |
(github.repository == 'ngrok/kubernetes-ingress-controller') &&
(needs.changes.outputs.charts == 'true')
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/install-relased-helm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
k8s_version: [ 'v1.28.13', 'v1.29.8', 'v1.30.4', 'v1.31.0' ]
max-parallel: 2
env:
NAMESPACE: ngrok-ingress-controller
NAMESPACE: ngrok-operator
steps:
- uses: actions/checkout@v4
- name: Install Helm
Expand All @@ -42,16 +42,17 @@ jobs:
NGROK_AUTHTOKEN: "SOME_AUTHTOKEN" # For now, these don't matter, mainly testing that it pulls the image and can get the CRDs
NGROK_API_KEY: "SOME_API_KEY"
timeout-minutes: 10
# TODO(operator-rename): Change this to ngrok/ngrok-operator when we are ready to release the helm chart
run: |
helm install ngrok-ingress-controller ngrok/kubernetes-ingress-controller \
helm install ngrok-operator ngrok/ngrok-operator \
--namespace $NAMESPACE \
--create-namespace \
--set credentials.apiKey=$NGROK_API_KEY \
--set credentials.authtoken=$NGROK_AUTHTOKEN \
--version ${{ inputs.chart_version }}
- name: Sleep for 30 seconds for startup
run: sleep 30
- name: Report pods # Expected to see the ingress-controller crashlooping. See above comment.
- name: Report pods # Expected to see the operator crashlooping. See above comment.
run: kubectl get pods --all-namespaces
- name: Try to list CRs of the CRDs we installed
run: |
Expand All @@ -60,7 +61,7 @@ jobs:
kubectl get httpsedges.ingress.k8s.ngrok.com
kubectl get tlsedges.ingress.k8s.ngrok.com
kubectl get tcpedges.ingress.k8s.ngrok.com
- name: Show logs of the ingress-controller
- name: Show logs of the ngrok-operator
continue-on-error: true
run: |
kubectl -n $NAMESPACE logs --selector='app.kubernetes.io/component=controller' --tail=100
4 changes: 2 additions & 2 deletions .github/workflows/pr-comments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
with:
filters: |
chartyaml:
- 'helm/ingress-controller/Chart.yaml'
- 'helm/ngrok-operator/Chart.yaml'
charts:
- 'helm/ingress-controller/**'
- 'helm/ngrok-operator/**'
- 'scripts/e2e.sh'
go:
- '**.go'
Expand Down
Loading

0 comments on commit 1e2367d

Please sign in to comment.