diff --git a/.github/ISSUE_TEMPLATE/controller_bug_report.yaml b/.github/ISSUE_TEMPLATE/controller_bug_report.yaml index 51c69003..c47ddf71 100644 --- a/.github/ISSUE_TEMPLATE/controller_bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/controller_bug_report.yaml @@ -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/kubernetes-operator/pulls) immediately instead. - type: input attributes: label: Kubernetes Version @@ -42,7 +42,7 @@ body: 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=kubernetes-operator` and copy the output here. validations: required: true - type: textarea diff --git a/.github/ISSUE_TEMPLATE/helm_bug_report.yaml b/.github/ISSUE_TEMPLATE/helm_bug_report.yaml index 8088cb5f..aadbeb90 100644 --- a/.github/ISSUE_TEMPLATE/helm_bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/helm_bug_report.yaml @@ -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/kubernetes-operator/pulls) immediately instead. - type: input attributes: label: Kubernetes Version diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 182a2c3e..3adca624 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -86,7 +86,7 @@ jobs: context: . platforms: ${{ steps.buildx-setup.outputs.platforms }} push: false - tags: ngrok/kubernetes-ingress-controller:latest + tags: ngrok/kubernetes-operator:latest go-mod-tidy: name: Go Mod Tidy Check diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 84170c1f..e7feb2f2 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -18,7 +18,7 @@ jobs: permissions: contents: read pull-requests: read - if: github.repository == 'ngrok/kubernetes-ingress-controller' + if: github.repository == 'ngrok/kubernetes-operator' steps: - name: Checkout repo uses: actions/checkout@v3 @@ -39,7 +39,7 @@ jobs: needs: - changes if: | - github.repository == 'ngrok/kubernetes-ingress-controller' && + github.repository == 'ngrok/kubernetes-operator' && github.event_name == 'push' && github.ref == 'refs/heads/main' steps: @@ -67,7 +67,7 @@ jobs: context: . platforms: ${{ steps.buildx-setup.outputs.platforms }} push: true - tags: ngrok/kubernetes-ingress-controller:latest + tags: ngrok/kubernetes-operator:latest - name: Build and push tag'd docker image uses: docker/build-push-action@v3 if: ${{ needs.changes.outputs.tag == 'true' }} @@ -75,7 +75,7 @@ jobs: context: . platforms: ${{ steps.buildx-setup.outputs.platforms }} push: true - tags: ngrok/kubernetes-ingress-controller:${{ steps.extract_tag.outputs.tag }} + tags: ngrok/kubernetes-operator:${{ steps.extract_tag.outputs.tag }} - name: Create GitHub Release uses: actions/github-script@v6 if: ${{ needs.changes.outputs.tag == 'true' }} @@ -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: `kubernetes-operator-${tag}`, + name: `kubernetes-operator-${tag}`, body: `${tag}`, draft: false, prerelease: false diff --git a/.github/workflows/helm_release.yaml b/.github/workflows/helm_release.yaml index b55d51f9..7f1e22ab 100644 --- a/.github/workflows/helm_release.yaml +++ b/.github/workflows/helm_release.yaml @@ -17,7 +17,7 @@ jobs: permissions: contents: read pull-requests: read - if: github.repository == 'ngrok/kubernetes-ingress-controller' + if: github.repository == 'ngrok/kubernetes-operator' steps: - name: Checkout repo uses: actions/checkout@v3 @@ -37,7 +37,7 @@ jobs: contents: write # need to write releases needs: [changes] if: | - (github.repository == 'ngrok/kubernetes-ingress-controller') && + (github.repository == 'ngrok/kubernetes-operator') && (needs.changes.outputs.charts == 'true') steps: - name: Checkout repo diff --git a/CHANGELOG.md b/CHANGELOG.md index d0c95268..30e151db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 0.13.0 +**Full Changelog**: TBD + +### Changed +- Renamed docker image from `ngrok/kubernetes-ingress-controller` to `ngrok/ngrok-operator`. + ## 0.12.0 **Full Changelog**: https://github.com/ngrok/kubernetes-ingress-controller/compare/kubernetes-ingress-controller-0.11.0...kubernetes-ingress-controller-0.12.0 diff --git a/Makefile b/Makefile index 5569d77f..c26cea5d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Image URL to use all building/pushing image targets -IMG ?= kubernetes-ingress-controller +IMG ?= ngrok-operator # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.29.0 -REPO_URL = github.com/ngrok/kubernetes-ingress-controller +REPO_URL = github.com/ngrok/ngrok-operator # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) @@ -57,7 +57,7 @@ preflight: ## Verifies required things like the go version .PHONY: manifests manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. - $(CONTROLLER_GEN) rbac:roleName=ngrok-ingress-controller-manager-role crd webhook paths="{./api/ingress/v1alpha1/, ./api/ngrok/v1alpha1, ./internal/controller/ingress/, ./internal/controller/ngrok/, ./internal/controller/gateway/}" \ + $(CONTROLLER_GEN) rbac:roleName=ngrok-operator-role crd webhook paths="{./api/ingress/v1alpha1/, ./api/ngrok/v1alpha1, ./internal/controller/ingress/, ./internal/controller/ngrok/, ./internal/controller/gateway/}" \ output:crd:artifacts:config=$(HELM_TEMPLATES_DIR)/crds \ output:rbac:artifacts:config=$(HELM_TEMPLATES_DIR)/rbac @@ -116,8 +116,8 @@ endif .PHONY: deploy deploy: _deploy-check-env-vars docker-build manifests kustomize _helm_setup ## Deploy controller to the K8s cluster specified in ~/.kube/config. - helm upgrade ngrok-ingress-controller $(HELM_CHART_DIR) --install \ - --namespace ngrok-ingress-controller \ + helm upgrade ngrok-operator $(HELM_CHART_DIR) --install \ + --namespace ngrok-operator \ --create-namespace \ --set image.repository=$(IMG) \ --set image.tag="latest" \ @@ -128,12 +128,12 @@ deploy: _deploy-check-env-vars docker-build manifests kustomize _helm_setup ## D --set log.level=debug \ --set log.stacktraceLevel=panic \ --set metaData.env=local,metaData.from=makefile &&\ - kubectl rollout restart deployment ngrok-ingress-controller-kubernetes-ingress-controller-manager -n ngrok-ingress-controller + kubectl rollout restart deployment ngrok-operator -n ngrok-operator .PHONY: deploy_gateway deploy_gateway: _deploy-check-env-vars docker-build manifests kustomize _helm_setup ## Deploy controller to the K8s cluster specified in ~/.kube/config. - helm upgrade ngrok-ingress-controller $(HELM_CHART_DIR) --install \ - --namespace ngrok-ingress-controller \ + helm upgrade ngrok-operator $(HELM_CHART_DIR) --install \ + --namespace ngrok-operator \ --create-namespace \ --set image.repository=$(IMG) \ --set image.tag="latest" \ @@ -145,7 +145,7 @@ deploy_gateway: _deploy-check-env-vars docker-build manifests kustomize _helm_se --set log.stacktraceLevel=panic \ --set metaData.env=local,metaData.from=makefile \ --set useExperimentalGatewayApi=true &&\ - kubectl rollout restart deployment ngrok-ingress-controller-kubernetes-ingress-controller-manager -n ngrok-ingress-controller + kubectl rollout restart deployment ngrok-operator -n ngrok-operator .PHONY: _deploy-check-env-vars _deploy-check-env-vars: @@ -158,7 +158,7 @@ endif .PHONY: undeploy undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. - helm uninstall ngrok-ingress-controller + helm uninstall ngrok-operator ##@ Build Dependencies diff --git a/PROJECT b/PROJECT index ff9e3c08..274fcc6c 100644 --- a/PROJECT +++ b/PROJECT @@ -6,8 +6,8 @@ domain: k8s.ngrok.com layout: - go.kubebuilder.io/v4 multigroup: true -projectName: kubernetes-ingress-controller -repo: github.com/ngrok/kubernetes-ingress-controller +projectName: ngrok-operator +repo: github.com/ngrok/ngrok-operator resources: - api: crdVersion: v1 @@ -16,7 +16,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: Domain - path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 + path: github.com/ngrok/ngrok-operator/api/ingress/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -25,7 +25,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: Tunnel - path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 + path: github.com/ngrok/ngrok-operator/api/ingress/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -34,7 +34,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: TCPEdge - path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 + path: github.com/ngrok/ngrok-operator/api/ingress/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -43,7 +43,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: HTTPSEdge - path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 + path: github.com/ngrok/ngrok-operator/api/ingress/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -52,7 +52,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: IPPolicy - path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 + path: github.com/ngrok/ngrok-operator/api/ingress/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -60,7 +60,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: NgrokModule - path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 + path: github.com/ngrok/ngrok-operator/api/ingress/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -68,7 +68,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: NgrokModuleSet - path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 + path: github.com/ngrok/ngrok-operator/api/ingress/v1alpha1 version: v1alpha1 - controller: true domain: k8s.ngrok.com @@ -87,6 +87,6 @@ resources: domain: k8s.ngrok.com group: ngrok kind: NgrokTrafficPolicy - path: github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1 + path: github.com/ngrok/ngrok-operator/api/ngrok/v1alpha1 version: v1alpha1 version: "3" diff --git a/README.md b/README.md index 7ee49b83..acf52dcd 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@

- - CI Status + + CI Status - + License @@ -34,7 +34,7 @@ Leverage [ngrok](https://ngrok.com/) for your ingress in your Kubernetes cluster. Instantly add load balancing, authentication, and observability to your services via ngrok Cloud Edge modules using Custom Resource Definitions (CRDs) and Kubernetes-native tooling. This repo contains both our [Kubernetes Ingress Controller](https://kubernetes.io/docs/concepts/services-networking/ingress/) and the [Kubernetes Gateway API](https://gateway-api.sigs.k8s.io/) -[Installation](#installation) | [Getting Started](https://ngrok.com/docs/using-ngrok-with/k8s/) | [Documentation](#documentation) | [Developer Guide](https://github.com/ngrok/kubernetes-ingress-controller/blob/main/docs/developer-guide/README.md) | [Known Issues](#known-issues) +[Installation](#installation) | [Getting Started](https://ngrok.com/docs/using-ngrok-with/k8s/) | [Documentation](#documentation) | [Developer Guide](https://github.com/ngrok/ngrok-operator/blob/main/docs/developer-guide/README.md) | [Known Issues](#known-issues) ## Installation @@ -45,7 +45,7 @@ Leverage [ngrok](https://ngrok.com/) for your ingress in your Kubernetes cluster Add the ngrok Ingress Controller Helm chart: ```sh -helm repo add ngrok https://ngrok.github.io/kubernetes-ingress-controller +helm repo add ngrok https://ngrok.github.io/ngrok-operator ``` Then, install the latest version (setting the appropriate values for your environment): @@ -55,7 +55,7 @@ export NAMESPACE=[YOUR_K8S_NAMESPACE] export NGROK_AUTHTOKEN=[AUTHTOKEN] export NGROK_API_KEY=[API_KEY] -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 \ @@ -78,7 +78,7 @@ kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/downloa Then, during the helm install set the experimental gateway flag. ```sh -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 \ @@ -90,8 +90,8 @@ helm install ngrok-ingress-controller ngrok/kubernetes-ingress-controller \ Apply the [sample combined manifest](manifest-bundle.yaml) from our repo: ```sh -kubectl apply -n ngrok-ingress-controller \ - -f https://raw.githubusercontent.com/ngrok/kubernetes-ingress-controller/main/manifest-bundle.yaml +kubectl apply -n ngrok-operator \ + -f https://raw.githubusercontent.com/ngrok/ngrok-operator/main/manifest-bundle.yaml ``` For a more in-depth installation guide follow our step-by-step [Getting Started](https://ngrok.com/docs/using-ngrok-with/k8s/) guide. @@ -106,7 +106,7 @@ The full documentation for the ngrok Ingress Controller can be found on our [k8s > > This project is currently in beta as we continue testing and receiving feedback. The functionality and CRD contracts may change. It is currently used internally at ngrok for providing ingress to some of our production workloads. -1. Current issues of concern for production workloads are being tracked [here](https://github.com/ngrok/kubernetes-ingress-controller/issues/208) and [here](https://github.com/ngrok/kubernetes-ingress-controller/issues/219). +1. Current issues of concern for production workloads are being tracked [here](https://github.com/ngrok/ngrok-operator/issues/208) and [here](https://github.com/ngrok/ngrok-operator/issues/219). ## Support diff --git a/VERSION b/VERSION index ac454c6a..54d1a4f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.12.0 +0.13.0 diff --git a/api/ingress/v1alpha1/ngrok_common.go b/api/ingress/v1alpha1/ngrok_common.go index 1b16493d..9206cea7 100644 --- a/api/ingress/v1alpha1/ngrok_common.go +++ b/api/ingress/v1alpha1/ngrok_common.go @@ -11,10 +11,10 @@ import ( // common ngrok API/Dashboard fields type ngrokAPICommon struct { // Description is a human-readable description of the object in the ngrok API/Dashboard - // +kubebuilder:default:=`Created by kubernetes-ingress-controller` + // +kubebuilder:default:=`Created by ngrok-operator` Description string `json:"description,omitempty"` // Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard - // +kubebuilder:default:=`{"owned-by":"kubernetes-ingress-controller"}` + // +kubebuilder:default:=`{"owned-by":"ngrok-operator"}` Metadata string `json:"metadata,omitempty"` } diff --git a/cmd/main.go b/cmd/main.go index bd671023..8d43525b 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -46,16 +46,16 @@ import ( "github.com/ngrok/ngrok-api-go/v5" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - ngrokv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations" - gatewaycontroller "github.com/ngrok/kubernetes-ingress-controller/internal/controller/gateway" - controllers "github.com/ngrok/kubernetes-ingress-controller/internal/controller/ingress" - ngrokctr "github.com/ngrok/kubernetes-ingress-controller/internal/controller/ngrok" - "github.com/ngrok/kubernetes-ingress-controller/internal/ngrokapi" - "github.com/ngrok/kubernetes-ingress-controller/internal/store" - "github.com/ngrok/kubernetes-ingress-controller/internal/version" - "github.com/ngrok/kubernetes-ingress-controller/pkg/tunneldriver" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + ngrokv1alpha1 "github.com/ngrok/ngrok-operator/api/ngrok/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/annotations" + gatewaycontroller "github.com/ngrok/ngrok-operator/internal/controller/gateway" + controllers "github.com/ngrok/ngrok-operator/internal/controller/ingress" + ngrokctr "github.com/ngrok/ngrok-operator/internal/controller/ngrok" + "github.com/ngrok/ngrok-operator/internal/ngrokapi" + "github.com/ngrok/ngrok-operator/internal/store" + "github.com/ngrok/ngrok-operator/internal/version" + "github.com/ngrok/ngrok-operator/pkg/tunneldriver" //+kubebuilder:scaffold:imports ) @@ -113,14 +113,14 @@ func cmd() *cobra.Command { c.Flags().StringVar(&opts.metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to") c.Flags().StringVar(&opts.probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.") - c.Flags().StringVar(&opts.electionID, "election-id", "ngrok-ingress-controller-leader", "The name of the configmap that is used for holding the leader lock") + c.Flags().StringVar(&opts.electionID, "election-id", "ngrok-operator-leader", "The name of the configmap that is used for holding the leader lock") c.Flags().StringVar(&opts.metaData, "metadata", "", "A comma separated list of key value pairs such as 'key1=value1,key2=value2' to be added to ngrok api resources as labels") c.Flags().StringVar(&opts.region, "region", "", "The region to use for ngrok tunnels") c.Flags().StringVar(&opts.serverAddr, "server-addr", "", "The address of the ngrok server to use for tunnels") c.Flags().StringVar(&opts.apiURL, "api-url", "", "The base URL to use for the ngrok api") c.Flags().StringVar(&opts.controllerName, "controller-name", "k8s.ngrok.com/ingress-controller", "The name of the controller to use for matching ingresses classes") c.Flags().StringVar(&opts.watchNamespace, "watch-namespace", "", "Namespace to watch for Kubernetes resources. Defaults to all namespaces.") - c.Flags().StringVar(&opts.managerName, "manager-name", "ngrok-ingress-controller-manager", "Manager name to identify unique ngrok ingress controller instances") + c.Flags().StringVar(&opts.managerName, "manager-name", "ngrok-operator", "Manager name to identify unique ngrok ingress controller instances") c.Flags().BoolVar(&opts.useExperimentalGatewayAPI, "use-experimental-gateway-api", false, "sets up experemental gatewayAPI") c.Flags().StringVar(&opts.rootCAs, "root-cas", "trusted", "trusted (default) or host: use the trusted ngrok agent CA or the host CA") opts.zapOpts = &zap.Options{} diff --git a/docs/developer-guide/README.md b/docs/developer-guide/README.md index abc74702..ef2dc1b3 100644 --- a/docs/developer-guide/README.md +++ b/docs/developer-guide/README.md @@ -22,15 +22,15 @@ Both of these can be obtained via [nix-direnv](https://github.com/nix-community/ export NGROK_API_KEY= export NGROK_AUTHTOKEN= # kubectl can connect to your cluster and images built locally are available to the cluster -kubectl create namespace ngrok-ingress-controller -kubectl config set-context --current --namespace=ngrok-ingress-controller +kubectl create namespace ngrok-operator +kubectl config set-context --current --namespace=ngrok-operator make deploy ``` ### Using the E2E Fixtures -Several examples are provided in the [`e2e-fixtures` folder](https://github.com/ngrok/kubernetes-ingress-controller/tree/main/e2e-fixtures). To use an example, make a copy of the included `EXAMPLE*config.yaml` in the same directory, like this: +Several examples are provided in the [`e2e-fixtures` folder](https://github.com/ngrok/ngrok-operator/tree/main/e2e-fixtures). To use an example, make a copy of the included `EXAMPLE*config.yaml` in the same directory, like this: - `cp e2e-fixtures/hello-world-ingress/EXAMPLE-config.yaml e2e-fixtures/hello-world-ingress/config.yaml` - `cp e2e-fixtures/ingress-class/EXAMPLE-config-different.yaml e2e-fixtures/ingress-class/config-different.yaml` diff --git a/docs/developer-guide/architecture.md b/docs/developer-guide/architecture.md index 2deff3a2..b31255d0 100644 --- a/docs/developer-guide/architecture.md +++ b/docs/developer-guide/architecture.md @@ -20,7 +20,7 @@ Individual controllers and the overall Manager are built using the kubernetes co Internally, the ngrok Kubernetes Ingress Controller is made up of multiple controllers working in concert with each other, communicating via the Kubernetes API to interpret Ingress objects and convert them into managed ngrok Edges and other resources. -Each of these controllers uses the same basic workflow to manage its resources. This will be dried up and documented as a part of [this issue](https://github.com/ngrok/kubernetes-ingress-controller/issues/118) +Each of these controllers uses the same basic workflow to manage its resources. This will be dried up and documented as a part of [this issue](https://github.com/ngrok/ngrok-operator/issues/118) The following controllers for the most part manage a single resource and reflect those changes in the ngrok API. - [IP Policy Controller](../../internal/controllers/ippolicy_controller.go): It simply watches these CRDs and reflects the changes in the ngrok API. diff --git a/docs/developer-guide/releasing.md b/docs/developer-guide/releasing.md index 5dcf4a03..6516ddbb 100644 --- a/docs/developer-guide/releasing.md +++ b/docs/developer-guide/releasing.md @@ -18,12 +18,12 @@ docker image can be used to run the Ingress Controller in a Kubernetes cluster w ### Docker Image The Docker image contains the ngrok Ingress Controller binary and is available on -Docker Hub [here](https://hub.docker.com/r/ngrok/kubernetes-ingress-controller). We currently +Docker Hub [here](https://hub.docker.com/r/ngrok/ngrok-operator). We currently support `amd64` and `arm64` architectures, with future plans to build for other architectures. ### Helm Chart -The helm chart is packaged and published to its own [helm repository](https://ngrok.github.io/kubernetes-ingress-controller/index.yaml) +The helm chart is packaged and published to its own [helm repository](https://ngrok.github.io/ngrok-operator/index.yaml) and can be installed by following the instructions in the chart's [README](../helm/ingress-controller/README.md). ## Semantic Versioning @@ -62,15 +62,15 @@ to the semantic versioning spec as described above. #### Controller -Releases of the controller will be tagged with a prefix of `kubernetes-ingress-controller-`. For example, -version `1.2.0` of the docker image will have a git tag of `kubernetes-ingress-controller-1.2.0` which -contains the code used to build the docker image `ngrok/kubernetes-ingress-controller:1.2.0`. +Releases of the controller will be tagged with a prefix of `ngrok-operator-`. For example, +version `1.2.0` of the docker image will have a git tag of `ngrok-operator-1.2.0` which +contains the code used to build the docker image `ngrok/ngrok-operator:1.2.0`. When changes that would affect the controller's docker image are pushed to `main`, a github workflow -will trigger. The workflow will build and publish the `ngrok/kubernetes-ingress-controller:latest` docker +will trigger. The workflow will build and publish the `ngrok/ngrok-operator:latest` docker image. If the `VERSION` file at the root of the repo is changed, the workflow will also create a git tag for the controller as described above and publish a tagged docker image. For instance when the -`VERSION` is changed to `1.2.0`, the workflow will create a git tag of `kubernetes-ingress-controller-1.2.0` -and publish the docker image `ngrok/kubernetes-ingress-controller:1.2.0`. +`VERSION` is changed to `1.2.0`, the workflow will create a git tag of `ngrok-operator-1.2.0` +and publish the docker image `ngrok/ngrok-operator:1.2.0`. diff --git a/docs/examples/consul/README.md b/docs/examples/consul/README.md index e85b6679..e14de888 100644 --- a/docs/examples/consul/README.md +++ b/docs/examples/consul/README.md @@ -35,7 +35,7 @@ Next we'll export our credentials as environment variables and install the contr export NGROK_API_KEY= export NGROK_AUTHTOKEN= -helm install ngrok-ingress-controller ngrok/kubernetes-ingress-controller --version 0.6.0 \ +helm install ngrok-operator ngrok/ngrok-operator --version 0.6.0 \ --namespace default \ --set credentials.apiKey=$NGROK_API_KEY \ --set credentials.authtoken=$NGROK_AUTHTOKEN @@ -49,10 +49,10 @@ At this point, the ngrok ingress controller pods may not be running yet. This is apiVersion: v1 kind: Service metadata: - name: ngrok-ingress-controller-kubernetes-ingress-controller + name: ngrok-ingress-controller-ngrok-operator namespace: default labels: - app: ngrok-ingress-controller-kubernetes-ingress-controller + app: ngrok-ingress-controller-ngrok-operator spec: ports: - name: http @@ -60,16 +60,16 @@ spec: protocol: TCP targetPort: 80 selector: - app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator ``` Now we can verify the controller is running and healthy: ```bash -kubectl get pods -l 'app.kubernetes.io/name=kubernetes-ingress-controller' -n default +kubectl get pods -l 'app.kubernetes.io/name=ngrok-operator' -n default NAME READY STATUS RESTARTS AGE -ngrok-ingress-controller-kubernetes-ingress-controller-manqwlhz 2/2 Running 2 (93s ago) 2m17s +ngrok-ingress-controller-ngrok-operator-manqwlhz 2/2 Running 2 (93s ago) 2m17s ``` Setting Up Ingress for the Demo Counter Application @@ -80,14 +80,14 @@ With the controller running, we can set up ingress for the Demo Counter Applicat apiVersion: consul.hashicorp.com/v1alpha1 kind: ServiceIntentions metadata: - name: ngrok-ingress-controller-kubernetes-ingress-controller + name: ngrok-operator namespace: default spec: destination: name: dashboard sources: - action: allow - name: ngrok-ingress-controller-kubernetes-ingress-controller + name: ngrok-operator ``` diff --git a/docs/examples/hello-world/README.md b/docs/examples/hello-world/README.md index baffde2d..09f64616 100644 --- a/docs/examples/hello-world/README.md +++ b/docs/examples/hello-world/README.md @@ -14,10 +14,10 @@ First we need to install the controller in the cluster. We'll export our credent ```bash export NGROK_API_KEY= export NGROK_AUTHTOKEN= -helm repo add ngrok https://ngrok.github.io/kubernetes-ingress-controller -helm install ngrok-ingress-controller ngrok/kubernetes-ingress-controller --version 0.8.0 \ +helm repo add ngrok https://ngrok.github.io/ngrok-operator +helm install ngrok-operator ngrok/ngrok-operator --version 0.8.0 \ --set image.tag=0.4.0 \ - --namespace ngrok-ingress-controller \ + --namespace ngrok-operator \ --create-namespace \ --set credentials.apiKey=$NGROK_API_KEY \ --set credentials.authtoken=$NGROK_AUTHTOKEN @@ -26,13 +26,13 @@ helm install ngrok-ingress-controller ngrok/kubernetes-ingress-controller --vers Verify the controller is running and healthy: ```bash -kubectl get pods -n ngrok-ingress-controller +kubectl get pods -n ngrok-operator ``` You should see something like this: ```bash NAME READY STATUS RESTARTS AGE -ngrok-ingress-controller-kubernetes-ingress-controller-mank8zgx 1/1 Running 0 104s +ngrok-ingress-controller-ngrok-operator-mank8zgx 1/1 Running 0 104s ``` ## Setup Ingress for a Service diff --git a/go.mod b/go.mod index 3974406f..5837c031 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ngrok/kubernetes-ingress-controller +module github.com/ngrok/ngrok-operator go 1.21 diff --git a/helm/ingress-controller/CHANGELOG.md b/helm/ingress-controller/CHANGELOG.md index 1d3da7a0..5ec3d954 100644 --- a/helm/ingress-controller/CHANGELOG.md +++ b/helm/ingress-controller/CHANGELOG.md @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - feat: Auto-provision domain for TLS Edges [#386]( https://github.com/ngrok/kubernetes-ingress-controller/pull/386) -- feat: Support for Load Balancer services [#387](https://github.com/ngrok/kubernetes-ingress-controller/pull/387) +- feat: Support for Load Balancer services [#387](https://github.com/ngrok/ngrok-operator/pull/387) - feat: Support TLS termination in modulesets for Load Balancer Services [388](https://github.com/ngrok/kubernetes-ingress-controller/pull/388) ## 0.13.0 diff --git a/helm/ingress-controller/Chart.lock b/helm/ingress-controller/Chart.lock index f02dfe16..0dad9077 100644 --- a/helm/ingress-controller/Chart.lock +++ b/helm/ingress-controller/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: https://charts.bitnami.com/bitnami - version: 2.19.3 -digest: sha256:b0c5b947a6622accb48678c6034a1180e1fb58d0d8c8d2fa44cb7e9c3b1a4255 -generated: "2024-05-21T13:06:30.412702362-05:00" + version: 2.20.3 +digest: sha256:993c3981678605068ef47b75614bcc0bcb70570962337b9e03e3ebc588ca1729 +generated: "2024-06-25T11:25:20.435758732-05:00" diff --git a/helm/ingress-controller/Chart.yaml b/helm/ingress-controller/Chart.yaml index b6d47432..4227166b 100644 --- a/helm/ingress-controller/Chart.yaml +++ b/helm/ingress-controller/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: kubernetes-ingress-controller +name: ngrok-operator description: A Kubernetes ingress controller built using ngrok. version: 0.14.0 appVersion: 0.12.0 @@ -11,8 +11,8 @@ keywords: - api gateway home: https://ngrok.com sources: - - https://github.com/ngrok/kubernetes-ingress-controller -icon: https://ngrok.github.io/kubernetes-ingress-controller/ngrok-favicon.svg + - https://github.com/ngrok/ngrok-operator +icon: https://ngrok.github.io/ngrok-operator/ngrok-favicon.svg dependencies: - name: common repository: https://charts.bitnami.com/bitnami diff --git a/helm/ingress-controller/README.md b/helm/ingress-controller/README.md index c4d0c067..506bb4dd 100644 --- a/helm/ingress-controller/README.md +++ b/helm/ingress-controller/README.md @@ -45,49 +45,49 @@ To uninstall the chart: ### Controller parameters -| Name | Description | Value | -| ------------------------------------ | --------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | -| `podAnnotations` | Used to apply custom annotations to the ingress pods. | `{}` | -| `podLabels` | Used to apply custom labels to the ingress pods. | `{}` | -| `replicaCount` | The number of controllers to run. | `1` | -| `image.registry` | The ngrok ingress controller image registry. | `docker.io` | -| `image.repository` | The ngrok ingress controller image repository. | `ngrok/kubernetes-ingress-controller` | -| `image.tag` | The ngrok ingress controller image tag. Defaults to the chart's appVersion if not specified | `""` | -| `image.pullPolicy` | The ngrok ingress controller image pull policy. | `IfNotPresent` | -| `image.pullSecrets` | An array of imagePullSecrets to be used when pulling the image. | `[]` | -| `ingressClass.name` | The name of the ingress class to use. | `ngrok` | -| `ingressClass.create` | Whether to create the ingress class. | `true` | -| `ingressClass.default` | Whether to set the ingress class as default. | `false` | -| `controllerName` | The name of the controller to look for matching ingress classes | `k8s.ngrok.com/ingress-controller` | -| `watchNamespace` | The namespace to watch for ingress resources. Defaults to all | `""` | -| `credentials.secret.name` | The name of the secret the credentials are in. If not provided, one will be generated using the helm release name. | `""` | -| `credentials.apiKey` | Your ngrok API key. If provided, it will be will be written to the secret and the authtoken must be provided as well. | `""` | -| `credentials.authtoken` | Your ngrok authtoken. If provided, it will be will be written to the secret and the apiKey must be provided as well. | `""` | -| `region` | ngrok region to create tunnels in. Defaults to connect to the closest geographical region. | `""` | -| `rootCAs` | Set to "trusted" for the ngrok agent CA or "host" to trust the host's CA. Defaults to "trusted". | `""` | -| `serverAddr` | This is the address of the ngrok server to connect to. You should set this if you are using a custom ingress address. | `""` | -| `apiURL` | This is the URL of the ngrok API. You should set this if you are using a custom API URL. | `""` | -| `metaData` | This is a map of key/value pairs that will be added as meta data to all ngrok api resources created | `{}` | -| `affinity` | Affinity for the controller pod assignment | `{}` | -| `podAffinityPreset` | Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | -| `podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` | -| `nodeAffinityPreset.type` | Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | -| `nodeAffinityPreset.key` | Node label key to match. Ignored if `affinity` is set. | `""` | -| `nodeAffinityPreset.values` | Node label values to match. Ignored if `affinity` is set. | `[]` | -| `priorityClassName` | Priority class for pod scheduling | `""` | -| `podDisruptionBudget.create` | Enable a Pod Disruption Budget creation | `false` | -| `podDisruptionBudget.minAvailable` | Minimum number/percentage of pods that should remain scheduled | `""` | -| `podDisruptionBudget.maxUnavailable` | Maximum number/percentage of pods that may be made unavailable | `1` | -| `resources.limits` | The resources limits for the container | `{}` | -| `resources.requests` | The requested resources for the container | `{}` | -| `extraVolumes` | An array of extra volumes to add to the controller. | `[]` | -| `extraVolumeMounts` | An array of extra volume mounts to add to the controller. | `[]` | -| `extraEnv` | an object of extra environment variables to add to the controller. | `{}` | -| `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` | -| `serviceAccount.name` | The name of the ServiceAccount to use. | `""` | -| `serviceAccount.annotations` | Additional annotations to add to the ServiceAccount | `{}` | -| `log.level` | The level to log at. One of 'debug', 'info', or 'error'. | `info` | -| `log.stacktraceLevel` | The level to report stacktrace logs one of 'info' or 'error'. | `error` | -| `log.format` | The log format to use. One of console, json. | `json` | -| `lifecycle` | an object containing lifecycle configuration | `{}` | +| Name | Description | Value | +| ------------------------------------ | --------------------------------------------------------------------------------------------------------------------- | ---------------------------------- | +| `podAnnotations` | Used to apply custom annotations to the ingress pods. | `{}` | +| `podLabels` | Used to apply custom labels to the ingress pods. | `{}` | +| `replicaCount` | The number of controllers to run. | `1` | +| `image.registry` | The ngrok ingress controller image registry. | `docker.io` | +| `image.repository` | The ngrok ingress controller image repository. | `ngrok/ngrok-operator` | +| `image.tag` | The ngrok ingress controller image tag. Defaults to the chart's appVersion if not specified | `""` | +| `image.pullPolicy` | The ngrok ingress controller image pull policy. | `IfNotPresent` | +| `image.pullSecrets` | An array of imagePullSecrets to be used when pulling the image. | `[]` | +| `ingressClass.name` | The name of the ingress class to use. | `ngrok` | +| `ingressClass.create` | Whether to create the ingress class. | `true` | +| `ingressClass.default` | Whether to set the ingress class as default. | `false` | +| `controllerName` | The name of the controller to look for matching ingress classes | `k8s.ngrok.com/ingress-controller` | +| `watchNamespace` | The namespace to watch for ingress resources. Defaults to all | `""` | +| `credentials.secret.name` | The name of the secret the credentials are in. If not provided, one will be generated using the helm release name. | `""` | +| `credentials.apiKey` | Your ngrok API key. If provided, it will be will be written to the secret and the authtoken must be provided as well. | `""` | +| `credentials.authtoken` | Your ngrok authtoken. If provided, it will be will be written to the secret and the apiKey must be provided as well. | `""` | +| `region` | ngrok region to create tunnels in. Defaults to connect to the closest geographical region. | `""` | +| `rootCAs` | Set to "trusted" for the ngrok agent CA or "host" to trust the host's CA. Defaults to "trusted". | `""` | +| `serverAddr` | This is the address of the ngrok server to connect to. You should set this if you are using a custom ingress address. | `""` | +| `apiURL` | This is the URL of the ngrok API. You should set this if you are using a custom API URL. | `""` | +| `metaData` | This is a map of key/value pairs that will be added as meta data to all ngrok api resources created | `{}` | +| `affinity` | Affinity for the controller pod assignment | `{}` | +| `podAffinityPreset` | Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` | +| `nodeAffinityPreset.type` | Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `nodeAffinityPreset.key` | Node label key to match. Ignored if `affinity` is set. | `""` | +| `nodeAffinityPreset.values` | Node label values to match. Ignored if `affinity` is set. | `[]` | +| `priorityClassName` | Priority class for pod scheduling | `""` | +| `podDisruptionBudget.create` | Enable a Pod Disruption Budget creation | `false` | +| `podDisruptionBudget.minAvailable` | Minimum number/percentage of pods that should remain scheduled | `""` | +| `podDisruptionBudget.maxUnavailable` | Maximum number/percentage of pods that may be made unavailable | `1` | +| `resources.limits` | The resources limits for the container | `{}` | +| `resources.requests` | The requested resources for the container | `{}` | +| `extraVolumes` | An array of extra volumes to add to the controller. | `[]` | +| `extraVolumeMounts` | An array of extra volume mounts to add to the controller. | `[]` | +| `extraEnv` | an object of extra environment variables to add to the controller. | `{}` | +| `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` | +| `serviceAccount.name` | The name of the ServiceAccount to use. | `""` | +| `serviceAccount.annotations` | Additional annotations to add to the ServiceAccount | `{}` | +| `log.level` | The level to log at. One of 'debug', 'info', or 'error'. | `info` | +| `log.stacktraceLevel` | The level to report stacktrace logs one of 'info' or 'error'. | `error` | +| `log.format` | The log format to use. One of console, json. | `json` | +| `lifecycle` | an object containing lifecycle configuration | `{}` | diff --git a/helm/ingress-controller/templates/_helpers.tpl b/helm/ingress-controller/templates/_helpers.tpl index c5be41cb..92c15ebf 100644 --- a/helm/ingress-controller/templates/_helpers.tpl +++ b/helm/ingress-controller/templates/_helpers.tpl @@ -2,14 +2,14 @@ {{/* Expand the name of the chart. */}} -{{- define "kubernetes-ingress-controller.name" -}} +{{- define "ngrok-operator.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create chart name and version as used by the chart label. */}} -{{- define "kubernetes-ingress-controller.chart" -}} +{{- define "ngrok-operator.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -17,7 +17,7 @@ Create chart name and version as used by the chart label. Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "kubernetes-ingress-controller.fullname" -}} +{{- define "ngrok-operator.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -33,24 +33,24 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{/* Create a default name for the credentials secret name using the helm release */}} -{{- define "kubernetes-ingress-controller.credentialsSecretName" -}} +{{- define "ngrok-operator.credentialsSecretName" -}} {{- if .Values.credentials.secret.name -}} {{- .Values.credentials.secret.name -}} {{- else -}} -{{- printf "%s-credentials" (include "kubernetes-ingress-controller.fullname" .) -}} +{{- printf "%s-credentials" (include "ngrok-operator.fullname" .) -}} {{- end -}} {{- end -}} {{/* Common labels */}} -{{- define "kubernetes-ingress-controller.labels" -}} -helm.sh/chart: {{ include "kubernetes-ingress-controller.chart" . }} -{{ include "kubernetes-ingress-controller.selectorLabels" . }} +{{- define "ngrok-operator.labels" -}} +helm.sh/chart: {{ include "ngrok-operator.chart" . }} +{{ include "ngrok-operator.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} -app.kubernetes.io/part-of: {{ template "kubernetes-ingress-controller.name" . }} +app.kubernetes.io/part-of: {{ template "ngrok-operator.name" . }} app.kubernetes.io/managed-by: {{ .Release.Service }} {{- if .Values.commonLabels}} {{ toYaml .Values.commonLabels }} @@ -60,17 +60,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "kubernetes-ingress-controller.selectorLabels" -}} -app.kubernetes.io/name: {{ include "kubernetes-ingress-controller.name" . }} +{{- define "ngrok-operator.selectorLabels" -}} +app.kubernetes.io/name: {{ include "ngrok-operator.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} {{/* Create the name of the controller service account to use */}} -{{- define "kubernetes-ingress-controller.serviceAccountName" -}} +{{- define "ngrok-operator.serviceAccountName" -}} {{- if .Values.serviceAccount.create -}} - {{ default (include "kubernetes-ingress-controller.fullname" .) .Values.serviceAccount.name }} + {{ default (include "ngrok-operator.fullname" .) .Values.serviceAccount.name }} {{- else -}} {{ default "default" .Values.serviceAccount.name }} {{- end -}} @@ -79,7 +79,7 @@ Create the name of the controller service account to use {{/* Return the ngrok/ingress-controller image name */}} -{{- define "kubernetes-ingress-controller.image" -}} +{{- define "ngrok-operator.image" -}} {{- $registryName := .Values.image.registry -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | default .Chart.AppVersion | toString -}} diff --git a/helm/ingress-controller/templates/controller-cm.yaml b/helm/ingress-controller/templates/controller-cm.yaml index 88728341..d9b3c667 100644 --- a/helm/ingress-controller/templates/controller-cm.yaml +++ b/helm/ingress-controller/templates/controller-cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "kubernetes-ingress-controller.fullname" . }}-manager-config + name: {{ include "ngrok-operator.fullname" . }}-config namespace: {{ .Release.Namespace }} data: controller_manager_config.yaml: | @@ -13,4 +13,4 @@ data: bindAddress: 127.0.0.1:8080 leaderElection: leaderElect: true - resourceName: {{ include "kubernetes-ingress-controller.fullname" . }}-leader + resourceName: {{ include "ngrok-operator.fullname" . }}-leader diff --git a/helm/ingress-controller/templates/controller-deployment.yaml b/helm/ingress-controller/templates/controller-deployment.yaml index 0bb1b98d..0dc945e8 100644 --- a/helm/ingress-controller/templates/controller-deployment.yaml +++ b/helm/ingress-controller/templates/controller-deployment.yaml @@ -3,9 +3,9 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} + {{- include "ngrok-operator.labels" . | nindent 4 }} app.kubernetes.io/component: {{ $component }} - name: {{ include "kubernetes-ingress-controller.fullname" . }}-manager + name: {{ .Release.Name }} namespace: {{ .Release.Namespace }} annotations: checksum/controller-role: {{ include (print $.Template.BasePath "/rbac/role.yaml") . | sha256sum }} @@ -14,7 +14,7 @@ spec: replicas: {{.Values.replicaCount}} selector: matchLabels: - {{- include "kubernetes-ingress-controller.selectorLabels" . | nindent 6 }} + {{- include "ngrok-operator.selectorLabels" . | nindent 6 }} {{- if .Values.podLabels }} {{- toYaml .Values.podLabels | nindent 6 }} {{- end }} @@ -32,7 +32,7 @@ spec: checksum/rbac: {{ include (print $.Template.BasePath "/controller-rbac.yaml") . | sha256sum }} checksum/secret: {{ include (print $.Template.BasePath "/credentials-secret.yaml") . | sha256sum }} labels: - {{- include "kubernetes-ingress-controller.selectorLabels" . | nindent 8 }} + {{- include "ngrok-operator.selectorLabels" . | nindent 8 }} {{- if .Values.podLabels }} {{- toYaml .Values.podLabels | nindent 8 }} {{- end }} @@ -49,14 +49,14 @@ spec: podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset "component" $component "context" $) | nindent 10 }} nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values) | nindent 10 }} {{- end }} - serviceAccountName: {{ template "kubernetes-ingress-controller.serviceAccountName" . }} + serviceAccountName: {{ template "ngrok-operator.serviceAccountName" . }} {{- if .Values.image.pullSecrets }} imagePullSecrets: {{- toYaml .Values.image.pullSecrets | nindent 8 }} {{- end }} containers: - - name: ngrok-ingress-controller - image: {{ include "kubernetes-ingress-controller.image" . }} + - name: ngrok-operator + image: {{ include "ngrok-operator.image" . }} imagePullPolicy: {{ .Values.image.pullPolicy }} command: - /manager @@ -92,8 +92,8 @@ spec: - --zap-encoder={{ .Values.log.format }} - --health-probe-bind-address=:8081 - --metrics-bind-address=:8080 - - --election-id={{ include "kubernetes-ingress-controller.fullname" . }}-leader - - --manager-name={{ include "kubernetes-ingress-controller.fullname" . }}-manager + - --election-id={{ include "ngrok-operator.fullname" . }}-leader + - --manager-name={{ include "ngrok-operator.fullname" . }} securityContext: allowPrivilegeEscalation: false env: @@ -101,12 +101,12 @@ spec: valueFrom: secretKeyRef: key: API_KEY - name: {{ include "kubernetes-ingress-controller.credentialsSecretName" . }} + name: {{ include "ngrok-operator.credentialsSecretName" . }} - name: NGROK_AUTHTOKEN valueFrom: secretKeyRef: key: AUTHTOKEN - name: {{ include "kubernetes-ingress-controller.credentialsSecretName" . }} + name: {{ include "ngrok-operator.credentialsSecretName" . }} - name: POD_NAMESPACE valueFrom: fieldRef: diff --git a/helm/ingress-controller/templates/controller-pdb.yaml b/helm/ingress-controller/templates/controller-pdb.yaml index 7046631a..8a9eac5e 100644 --- a/helm/ingress-controller/templates/controller-pdb.yaml +++ b/helm/ingress-controller/templates/controller-pdb.yaml @@ -4,10 +4,10 @@ apiVersion: policy/v1 kind: PodDisruptionBudget metadata: - name: {{ include "kubernetes-ingress-controller.fullname" . }}-controller-pdb + name: {{ include "ngrok-operator.fullname" . }}-controller-pdb namespace: {{ .Release.Namespace | quote }} labels: - {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} + {{- include "ngrok-operator.labels" . | nindent 4 }} app.kubernetes.io/component: {{ $component }} spec: {{- if .Values.podDisruptionBudget.minAvailable }} @@ -18,7 +18,7 @@ spec: {{- end }} selector: matchLabels: - {{- include "kubernetes-ingress-controller.selectorLabels" . | nindent 6 }} + {{- include "ngrok-operator.selectorLabels" . | nindent 6 }} {{- if .Values.podLabels }} {{- toYaml .Values.podLabels | nindent 6 }} {{- end }} diff --git a/helm/ingress-controller/templates/controller-rbac.yaml b/helm/ingress-controller/templates/controller-rbac.yaml index 82fade5c..4617ec4f 100644 --- a/helm/ingress-controller/templates/controller-rbac.yaml +++ b/helm/ingress-controller/templates/controller-rbac.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: ngrok-ingress-controller-leader-election-role + name: ngrok-operator-leader-election-role namespace: {{ .Release.Namespace }} rules: - apiGroups: @@ -40,7 +40,7 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: ngrok-ingress-controller-proxy-role + name: ngrok-operator-proxy-role rules: - apiGroups: - authentication.k8s.io @@ -58,39 +58,39 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: ngrok-ingress-controller-leader-election-rolebinding + name: ngrok-operator-leader-election-rolebinding namespace: {{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: ngrok-ingress-controller-leader-election-role + name: ngrok-operator-leader-election-role subjects: - kind: ServiceAccount - name: {{ template "kubernetes-ingress-controller.serviceAccountName" . }} + name: {{ template "ngrok-operator.serviceAccountName" . }} namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ngrok-ingress-controller-manager-rolebinding + name: ngrok-operator-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: ngrok-ingress-controller-manager-role + name: ngrok-operator-role subjects: - kind: ServiceAccount - name: {{ template "kubernetes-ingress-controller.serviceAccountName" . }} + name: {{ template "ngrok-operator.serviceAccountName" . }} namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ngrok-ingress-controller-proxy-rolebinding + name: ngrok-operator-proxy-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: ngrok-ingress-controller-proxy-role + name: ngrok-operator-proxy-role subjects: - kind: ServiceAccount - name: {{ template "kubernetes-ingress-controller.serviceAccountName" . }} + name: {{ template "ngrok-operator.serviceAccountName" . }} namespace: {{ .Release.Namespace }} diff --git a/helm/ingress-controller/templates/controller-serviceaccount.yaml b/helm/ingress-controller/templates/controller-serviceaccount.yaml index d80a5d8c..ffa5f161 100644 --- a/helm/ingress-controller/templates/controller-serviceaccount.yaml +++ b/helm/ingress-controller/templates/controller-serviceaccount.yaml @@ -3,10 +3,10 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "kubernetes-ingress-controller.serviceAccountName" . }} + name: {{ template "ngrok-operator.serviceAccountName" . }} namespace: {{ .Release.Namespace }} labels: - {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} + {{- include "ngrok-operator.labels" . | nindent 4 }} app.kubernetes.io/component: controller {{- if .Values.serviceAccount.annotations }} annotations: diff --git a/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_domains.yaml b/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_domains.yaml index ab02a958..796f003f 100644 --- a/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_domains.yaml +++ b/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_domains.yaml @@ -61,7 +61,7 @@ spec: description: DomainSpec defines the desired state of Domain properties: description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -69,7 +69,7 @@ spec: description: Domain is the domain name to reserve type: string metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string diff --git a/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_httpsedges.yaml b/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_httpsedges.yaml index ffafa423..7b3267ac 100644 --- a/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_httpsedges.yaml +++ b/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_httpsedges.yaml @@ -40,7 +40,7 @@ spec: description: HTTPSEdgeSpec defines the desired state of HTTPSEdge properties: description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -50,7 +50,7 @@ spec: type: string type: array metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string @@ -74,7 +74,7 @@ spec: that serves traffic for this edge properties: description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -84,7 +84,7 @@ spec: description: Labels to watch for tunnels on this backend type: object metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string @@ -135,7 +135,7 @@ spec: type: boolean type: object description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -203,7 +203,7 @@ spec: - path_prefix type: string metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string diff --git a/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_ippolicies.yaml b/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_ippolicies.yaml index 1508f760..801b5e22 100644 --- a/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_ippolicies.yaml +++ b/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_ippolicies.yaml @@ -49,12 +49,12 @@ spec: description: IPPolicySpec defines the desired state of IPPolicy properties: description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string @@ -70,12 +70,12 @@ spec: cidr: type: string description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string diff --git a/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_tcpedges.yaml b/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_tcpedges.yaml index 02016208..72cb85a2 100644 --- a/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_tcpedges.yaml +++ b/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_tcpedges.yaml @@ -62,7 +62,7 @@ spec: that serves traffic for this edge properties: description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -72,13 +72,13 @@ spec: description: Labels to watch for tunnels on this backend type: object metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string type: object description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -91,7 +91,7 @@ spec: type: array type: object metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string diff --git a/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_tlsedges.yaml b/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_tlsedges.yaml index 4aa99d3d..b069f638 100644 --- a/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_tlsedges.yaml +++ b/helm/ingress-controller/templates/crds/ingress.k8s.ngrok.com_tlsedges.yaml @@ -62,7 +62,7 @@ spec: that serves traffic for this edge properties: description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -72,13 +72,13 @@ spec: description: Labels to watch for tunnels on this backend type: object metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string type: object description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -96,7 +96,7 @@ spec: type: array type: object metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string diff --git a/helm/ingress-controller/templates/credentials-secret.yaml b/helm/ingress-controller/templates/credentials-secret.yaml index c6c7286e..73615691 100644 --- a/helm/ingress-controller/templates/credentials-secret.yaml +++ b/helm/ingress-controller/templates/credentials-secret.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: {{ include "kubernetes-ingress-controller.credentialsSecretName" .}} + name: {{ include "ngrok-operator.credentialsSecretName" .}} namespace: {{ .Release.Namespace }} type: Opaque data: diff --git a/helm/ingress-controller/templates/ingress-class.yaml b/helm/ingress-controller/templates/ingress-class.yaml index 0932b470..8d966b0a 100644 --- a/helm/ingress-controller/templates/ingress-class.yaml +++ b/helm/ingress-controller/templates/ingress-class.yaml @@ -3,7 +3,7 @@ apiVersion: networking.k8s.io/v1 kind: IngressClass metadata: labels: - {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} + {{- include "ngrok-operator.labels" . | nindent 4 }} app.kubernetes.io/component: controller name: {{ .Values.ingressClass.name }} {{- if .Values.ingressClass.default }} diff --git a/helm/ingress-controller/templates/rbac/domain_editor_role.yaml b/helm/ingress-controller/templates/rbac/domain_editor_role.yaml index 88e527a3..bed78abf 100644 --- a/helm/ingress-controller/templates/rbac/domain_editor_role.yaml +++ b/helm/ingress-controller/templates/rbac/domain_editor_role.yaml @@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} + {{- include "ngrok-operator.labels" . | nindent 4 }} app.kubernetes.io/component: rbac - name: {{ include "kubernetes-ingress-controller.fullname" . }}-domain-editor-role + name: {{ include "ngrok-operator.fullname" . }}-domain-editor-role rules: - apiGroups: - ingress.k8s.ngrok.com diff --git a/helm/ingress-controller/templates/rbac/domain_viewer_role.yaml b/helm/ingress-controller/templates/rbac/domain_viewer_role.yaml index bf5f5196..66810d4b 100644 --- a/helm/ingress-controller/templates/rbac/domain_viewer_role.yaml +++ b/helm/ingress-controller/templates/rbac/domain_viewer_role.yaml @@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} + {{- include "ngrok-operator.labels" . | nindent 4 }} app.kubernetes.io/component: rbac - name: {{ include "kubernetes-ingress-controller.fullname" . }}-domain-viewer-role + name: {{ include "ngrok-operator.fullname" . }}-domain-viewer-role rules: - apiGroups: - ingress.k8s.ngrok.com diff --git a/helm/ingress-controller/templates/rbac/httpsedge_editor_role.yaml b/helm/ingress-controller/templates/rbac/httpsedge_editor_role.yaml index d4d38315..0cf97aa7 100644 --- a/helm/ingress-controller/templates/rbac/httpsedge_editor_role.yaml +++ b/helm/ingress-controller/templates/rbac/httpsedge_editor_role.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: httpsedge-editor-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: httpsedge-editor-role rules: diff --git a/helm/ingress-controller/templates/rbac/httpsedge_viewer_role.yaml b/helm/ingress-controller/templates/rbac/httpsedge_viewer_role.yaml index 8d01cd72..eed2aee7 100644 --- a/helm/ingress-controller/templates/rbac/httpsedge_viewer_role.yaml +++ b/helm/ingress-controller/templates/rbac/httpsedge_viewer_role.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: httpsedge-viewer-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: httpsedge-viewer-role rules: diff --git a/helm/ingress-controller/templates/rbac/ippolicy_editor_role.yaml b/helm/ingress-controller/templates/rbac/ippolicy_editor_role.yaml index a8aa5ebe..2a900a06 100644 --- a/helm/ingress-controller/templates/rbac/ippolicy_editor_role.yaml +++ b/helm/ingress-controller/templates/rbac/ippolicy_editor_role.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: ippolicy-editor-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: ippolicy-editor-role rules: diff --git a/helm/ingress-controller/templates/rbac/ippolicy_viewer_role.yaml b/helm/ingress-controller/templates/rbac/ippolicy_viewer_role.yaml index a83a34ab..5233d51c 100644 --- a/helm/ingress-controller/templates/rbac/ippolicy_viewer_role.yaml +++ b/helm/ingress-controller/templates/rbac/ippolicy_viewer_role.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: ippolicy-viewer-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: ippolicy-viewer-role rules: diff --git a/helm/ingress-controller/templates/rbac/ngrokmoduleset_editor_role.yaml b/helm/ingress-controller/templates/rbac/ngrokmoduleset_editor_role.yaml index c8d5f163..b04f1661 100644 --- a/helm/ingress-controller/templates/rbac/ngrokmoduleset_editor_role.yaml +++ b/helm/ingress-controller/templates/rbac/ngrokmoduleset_editor_role.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: ngrokmoduleset-editor-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: kubernetes-ingress-controller - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: ngrokmoduleset-editor-role rules: diff --git a/helm/ingress-controller/templates/rbac/ngrokmoduleset_viewer_role.yaml b/helm/ingress-controller/templates/rbac/ngrokmoduleset_viewer_role.yaml index a9948ad4..be9de07a 100644 --- a/helm/ingress-controller/templates/rbac/ngrokmoduleset_viewer_role.yaml +++ b/helm/ingress-controller/templates/rbac/ngrokmoduleset_viewer_role.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: ngrokmoduleset-viewer-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: kubernetes-ingress-controller - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: ngrokmoduleset-viewer-role rules: diff --git a/helm/ingress-controller/templates/rbac/role.yaml b/helm/ingress-controller/templates/rbac/role.yaml index 4b05ac60..77068ae8 100644 --- a/helm/ingress-controller/templates/rbac/role.yaml +++ b/helm/ingress-controller/templates/rbac/role.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: ngrok-ingress-controller-manager-role + name: ngrok-operator-role rules: - apiGroups: - "" diff --git a/helm/ingress-controller/templates/rbac/tcpedge_editor_role.yaml b/helm/ingress-controller/templates/rbac/tcpedge_editor_role.yaml index 2e49847f..45de0523 100644 --- a/helm/ingress-controller/templates/rbac/tcpedge_editor_role.yaml +++ b/helm/ingress-controller/templates/rbac/tcpedge_editor_role.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: tcpedge-editor-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: tcpedge-editor-role rules: diff --git a/helm/ingress-controller/templates/rbac/tcpedge_viewer_role.yaml b/helm/ingress-controller/templates/rbac/tcpedge_viewer_role.yaml index b8eb5ef1..461e457b 100644 --- a/helm/ingress-controller/templates/rbac/tcpedge_viewer_role.yaml +++ b/helm/ingress-controller/templates/rbac/tcpedge_viewer_role.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: tcpedge-viewer-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: tcpedge-viewer-role rules: diff --git a/helm/ingress-controller/templates/rbac/tlsedge_editor_role.yaml b/helm/ingress-controller/templates/rbac/tlsedge_editor_role.yaml index 9d052319..6d85acca 100644 --- a/helm/ingress-controller/templates/rbac/tlsedge_editor_role.yaml +++ b/helm/ingress-controller/templates/rbac/tlsedge_editor_role.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: tlsedge-editor-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: tlsedge-editor-role rules: diff --git a/helm/ingress-controller/templates/rbac/tlsedge_viewer_role.yaml b/helm/ingress-controller/templates/rbac/tlsedge_viewer_role.yaml index a9eb99d9..0d5998df 100644 --- a/helm/ingress-controller/templates/rbac/tlsedge_viewer_role.yaml +++ b/helm/ingress-controller/templates/rbac/tlsedge_viewer_role.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: tlsedge-viewer-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: tlsedge-viewer-role rules: diff --git a/helm/ingress-controller/templates/rbac/tunnel_editor_role.yaml b/helm/ingress-controller/templates/rbac/tunnel_editor_role.yaml index ab727516..2e8d8801 100644 --- a/helm/ingress-controller/templates/rbac/tunnel_editor_role.yaml +++ b/helm/ingress-controller/templates/rbac/tunnel_editor_role.yaml @@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} + {{- include "ngrok-operator.labels" . | nindent 4 }} app.kubernetes.io/component: rbac - name: {{ include "kubernetes-ingress-controller.fullname" . }}-tunnel-editor-role + name: {{ include "ngrok-operator.fullname" . }}-tunnel-editor-role rules: - apiGroups: - ingress.k8s.ngrok.com diff --git a/helm/ingress-controller/templates/rbac/tunnel_viewer_role.yaml b/helm/ingress-controller/templates/rbac/tunnel_viewer_role.yaml index dfdb4b6f..3710735a 100644 --- a/helm/ingress-controller/templates/rbac/tunnel_viewer_role.yaml +++ b/helm/ingress-controller/templates/rbac/tunnel_viewer_role.yaml @@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} + {{- include "ngrok-operator.labels" . | nindent 4 }} app.kubernetes.io/component: rbac - name: {{ include "kubernetes-ingress-controller.fullname" . }}-tunnel-viewer-role + name: {{ include "ngrok-operator.fullname" . }}-tunnel-viewer-role rules: - apiGroups: - ingress.k8s.ngrok.com diff --git a/helm/ingress-controller/tests/__snapshot__/controller-cm_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/controller-cm_test.yaml.snap index e55b1ddc..45b548f9 100644 --- a/helm/ingress-controller/tests/__snapshot__/controller-cm_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/controller-cm_test.yaml.snap @@ -11,8 +11,8 @@ should match snapshot: bindAddress: 127.0.0.1:8080 leaderElection: leaderElect: true - resourceName: test-release-kubernetes-ingress-controller-leader + resourceName: test-release-ngrok-operator-leader kind: ConfigMap metadata: - name: test-release-kubernetes-ingress-controller-manager-config + name: test-release-ngrok-operator-config namespace: test-namespace diff --git a/helm/ingress-controller/tests/__snapshot__/controller-deployment_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/controller-deployment_test.yaml.snap index 71771031..bcbe8eb6 100644 --- a/helm/ingress-controller/tests/__snapshot__/controller-deployment_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/controller-deployment_test.yaml.snap @@ -4,17 +4,17 @@ Should match all-options snapshot: kind: Deployment metadata: annotations: - checksum/controller-role: 7a410be28b1592797fe68e262cc5a7c24a8c3c6aaff67b396203315b701818e7 - checksum/rbac: d31fdcb337a6f1ee71323040c2cbc4d5580d73ae5f7623cd19be57db97f748c1 + checksum/controller-role: a17193673c77e137e7663cb94778e15978db8290e6af27304a34631572661652 + checksum/rbac: 8c7b81c69bcd2cc1fd76b197b817206802f8868b8df607264588cccafa01067c labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubernetes-ingress-controller - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/version: 0.12.0 - helm.sh/chart: kubernetes-ingress-controller-0.14.0 - name: RELEASE-NAME-kubernetes-ingress-controller-manager + helm.sh/chart: ngrok-operator-0.14.0 + name: RELEASE-NAME namespace: NAMESPACE spec: replicas: 1 @@ -22,12 +22,12 @@ Should match all-options snapshot: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME - app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator template: metadata: annotations: - checksum/controller-role: 7a410be28b1592797fe68e262cc5a7c24a8c3c6aaff67b396203315b701818e7 - checksum/rbac: d31fdcb337a6f1ee71323040c2cbc4d5580d73ae5f7623cd19be57db97f748c1 + checksum/controller-role: a17193673c77e137e7663cb94778e15978db8290e6af27304a34631572661652 + checksum/rbac: 8c7b81c69bcd2cc1fd76b197b817206802f8868b8df607264588cccafa01067c checksum/secret: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b prometheus.io/path: /metrics prometheus.io/port: "8080" @@ -35,7 +35,7 @@ Should match all-options snapshot: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME - app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator spec: affinity: nodeAffinity: null @@ -47,7 +47,7 @@ Should match all-options snapshot: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME - app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator topologyKey: kubernetes.io/hostname weight: 1 containers: @@ -58,8 +58,8 @@ Should match all-options snapshot: - --zap-encoder=json - --health-probe-bind-address=:8081 - --metrics-bind-address=:8080 - - --election-id=RELEASE-NAME-kubernetes-ingress-controller-leader - - --manager-name=RELEASE-NAME-kubernetes-ingress-controller-manager + - --election-id=RELEASE-NAME-ngrok-operator-leader + - --manager-name=RELEASE-NAME-ngrok-operator command: - /manager env: @@ -67,12 +67,12 @@ Should match all-options snapshot: valueFrom: secretKeyRef: key: API_KEY - name: RELEASE-NAME-kubernetes-ingress-controller-credentials + name: RELEASE-NAME-ngrok-operator-credentials - name: NGROK_AUTHTOKEN valueFrom: secretKeyRef: key: AUTHTOKEN - name: RELEASE-NAME-kubernetes-ingress-controller-credentials + name: RELEASE-NAME-ngrok-operator-credentials - name: POD_NAMESPACE valueFrom: fieldRef: @@ -84,7 +84,7 @@ Should match all-options snapshot: value: test-value - name: TEST_ENV_VAR value: test - image: docker.io/ngrok/kubernetes-ingress-controller:0.12.0 + image: docker.io/ngrok/ngrok-operator:0.12.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -92,7 +92,7 @@ Should match all-options snapshot: port: 8081 initialDelaySeconds: 15 periodSeconds: 20 - name: ngrok-ingress-controller + name: ngrok-operator readinessProbe: httpGet: path: /readyz @@ -107,7 +107,7 @@ Should match all-options snapshot: volumeMounts: - mountPath: /test-volume name: test-volume - serviceAccountName: RELEASE-NAME-kubernetes-ingress-controller + serviceAccountName: RELEASE-NAME-ngrok-operator volumes: - emptyDir: {} name: test-volume @@ -115,7 +115,7 @@ Should match all-options snapshot: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: ngrok-ingress-controller-leader-election-role + name: ngrok-operator-leader-election-role namespace: NAMESPACE rules: - apiGroups: @@ -153,7 +153,7 @@ Should match all-options snapshot: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: ngrok-ingress-controller-proxy-role + name: ngrok-operator-proxy-role rules: - apiGroups: - authentication.k8s.io @@ -171,47 +171,47 @@ Should match all-options snapshot: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: ngrok-ingress-controller-leader-election-rolebinding + name: ngrok-operator-leader-election-rolebinding namespace: NAMESPACE roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: ngrok-ingress-controller-leader-election-role + name: ngrok-operator-leader-election-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-kubernetes-ingress-controller + name: RELEASE-NAME-ngrok-operator namespace: NAMESPACE 5: | apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ngrok-ingress-controller-manager-rolebinding + name: ngrok-operator-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: ngrok-ingress-controller-manager-role + name: ngrok-operator-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-kubernetes-ingress-controller + name: RELEASE-NAME-ngrok-operator namespace: NAMESPACE 6: | apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ngrok-ingress-controller-proxy-rolebinding + name: ngrok-operator-proxy-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: ngrok-ingress-controller-proxy-role + name: ngrok-operator-proxy-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-kubernetes-ingress-controller + name: RELEASE-NAME-ngrok-operator namespace: NAMESPACE 7: | apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: ngrok-ingress-controller-manager-role + name: ngrok-operator-role rules: - apiGroups: - "" @@ -543,17 +543,17 @@ Should match default snapshot: kind: Deployment metadata: annotations: - checksum/controller-role: 7a410be28b1592797fe68e262cc5a7c24a8c3c6aaff67b396203315b701818e7 - checksum/rbac: d31fdcb337a6f1ee71323040c2cbc4d5580d73ae5f7623cd19be57db97f748c1 + checksum/controller-role: a17193673c77e137e7663cb94778e15978db8290e6af27304a34631572661652 + checksum/rbac: 8c7b81c69bcd2cc1fd76b197b817206802f8868b8df607264588cccafa01067c labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubernetes-ingress-controller - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/version: 0.12.0 - helm.sh/chart: kubernetes-ingress-controller-0.14.0 - name: RELEASE-NAME-kubernetes-ingress-controller-manager + helm.sh/chart: ngrok-operator-0.14.0 + name: RELEASE-NAME namespace: NAMESPACE spec: replicas: 1 @@ -561,12 +561,12 @@ Should match default snapshot: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME - app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator template: metadata: annotations: - checksum/controller-role: 7a410be28b1592797fe68e262cc5a7c24a8c3c6aaff67b396203315b701818e7 - checksum/rbac: d31fdcb337a6f1ee71323040c2cbc4d5580d73ae5f7623cd19be57db97f748c1 + checksum/controller-role: a17193673c77e137e7663cb94778e15978db8290e6af27304a34631572661652 + checksum/rbac: 8c7b81c69bcd2cc1fd76b197b817206802f8868b8df607264588cccafa01067c checksum/secret: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b prometheus.io/path: /metrics prometheus.io/port: "8080" @@ -574,7 +574,7 @@ Should match default snapshot: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME - app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator spec: affinity: nodeAffinity: null @@ -586,7 +586,7 @@ Should match default snapshot: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME - app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator topologyKey: kubernetes.io/hostname weight: 1 containers: @@ -597,8 +597,8 @@ Should match default snapshot: - --zap-encoder=json - --health-probe-bind-address=:8081 - --metrics-bind-address=:8080 - - --election-id=RELEASE-NAME-kubernetes-ingress-controller-leader - - --manager-name=RELEASE-NAME-kubernetes-ingress-controller-manager + - --election-id=RELEASE-NAME-ngrok-operator-leader + - --manager-name=RELEASE-NAME-ngrok-operator command: - /manager env: @@ -606,17 +606,17 @@ Should match default snapshot: valueFrom: secretKeyRef: key: API_KEY - name: RELEASE-NAME-kubernetes-ingress-controller-credentials + name: RELEASE-NAME-ngrok-operator-credentials - name: NGROK_AUTHTOKEN valueFrom: secretKeyRef: key: AUTHTOKEN - name: RELEASE-NAME-kubernetes-ingress-controller-credentials + name: RELEASE-NAME-ngrok-operator-credentials - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace - image: docker.io/ngrok/kubernetes-ingress-controller:0.12.0 + image: docker.io/ngrok/ngrok-operator:0.12.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -624,7 +624,7 @@ Should match default snapshot: port: 8081 initialDelaySeconds: 15 periodSeconds: 20 - name: ngrok-ingress-controller + name: ngrok-operator readinessProbe: httpGet: path: /readyz @@ -636,12 +636,12 @@ Should match default snapshot: requests: {} securityContext: allowPrivilegeEscalation: false - serviceAccountName: RELEASE-NAME-kubernetes-ingress-controller + serviceAccountName: RELEASE-NAME-ngrok-operator 2: | apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: ngrok-ingress-controller-leader-election-role + name: ngrok-operator-leader-election-role namespace: NAMESPACE rules: - apiGroups: @@ -679,7 +679,7 @@ Should match default snapshot: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: ngrok-ingress-controller-proxy-role + name: ngrok-operator-proxy-role rules: - apiGroups: - authentication.k8s.io @@ -697,47 +697,47 @@ Should match default snapshot: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: ngrok-ingress-controller-leader-election-rolebinding + name: ngrok-operator-leader-election-rolebinding namespace: NAMESPACE roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: ngrok-ingress-controller-leader-election-role + name: ngrok-operator-leader-election-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-kubernetes-ingress-controller + name: RELEASE-NAME-ngrok-operator namespace: NAMESPACE 5: | apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ngrok-ingress-controller-manager-rolebinding + name: ngrok-operator-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: ngrok-ingress-controller-manager-role + name: ngrok-operator-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-kubernetes-ingress-controller + name: RELEASE-NAME-ngrok-operator namespace: NAMESPACE 6: | apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ngrok-ingress-controller-proxy-rolebinding + name: ngrok-operator-proxy-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: ngrok-ingress-controller-proxy-role + name: ngrok-operator-proxy-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-kubernetes-ingress-controller + name: RELEASE-NAME-ngrok-operator namespace: NAMESPACE 7: | apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: ngrok-ingress-controller-manager-role + name: ngrok-operator-role rules: - apiGroups: - "" diff --git a/helm/ingress-controller/tests/__snapshot__/controller-pdb_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/controller-pdb_test.yaml.snap index 7b59c734..c1b47d4c 100644 --- a/helm/ingress-controller/tests/__snapshot__/controller-pdb_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/controller-pdb_test.yaml.snap @@ -7,11 +7,11 @@ should match snapshot: app.kubernetes.io/component: controller app.kubernetes.io/instance: test-release app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubernetes-ingress-controller - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/version: 0.12.0 - helm.sh/chart: kubernetes-ingress-controller-0.14.0 - name: test-release-kubernetes-ingress-controller-controller-pdb + helm.sh/chart: ngrok-operator-0.14.0 + name: test-release-ngrok-operator-controller-pdb namespace: test-namespace spec: maxUnavailable: 1 @@ -19,4 +19,4 @@ should match snapshot: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/instance: test-release - app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator diff --git a/helm/ingress-controller/tests/__snapshot__/controller-rbac_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/controller-rbac_test.yaml.snap index e236be78..f926bc23 100644 --- a/helm/ingress-controller/tests/__snapshot__/controller-rbac_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/controller-rbac_test.yaml.snap @@ -3,7 +3,7 @@ Should match snapshot: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: ngrok-ingress-controller-leader-election-role + name: ngrok-operator-leader-election-role namespace: NAMESPACE rules: - apiGroups: @@ -41,7 +41,7 @@ Should match snapshot: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: ngrok-ingress-controller-proxy-role + name: ngrok-operator-proxy-role rules: - apiGroups: - authentication.k8s.io @@ -59,39 +59,39 @@ Should match snapshot: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: ngrok-ingress-controller-leader-election-rolebinding + name: ngrok-operator-leader-election-rolebinding namespace: NAMESPACE roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: ngrok-ingress-controller-leader-election-role + name: ngrok-operator-leader-election-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-kubernetes-ingress-controller + name: RELEASE-NAME-ngrok-operator namespace: NAMESPACE 4: | apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ngrok-ingress-controller-manager-rolebinding + name: ngrok-operator-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: ngrok-ingress-controller-manager-role + name: ngrok-operator-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-kubernetes-ingress-controller + name: RELEASE-NAME-ngrok-operator namespace: NAMESPACE 5: | apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ngrok-ingress-controller-proxy-rolebinding + name: ngrok-operator-proxy-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: ngrok-ingress-controller-proxy-role + name: ngrok-operator-proxy-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-kubernetes-ingress-controller + name: RELEASE-NAME-ngrok-operator namespace: NAMESPACE diff --git a/helm/ingress-controller/tests/__snapshot__/controller-serviceaccount_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/controller-serviceaccount_test.yaml.snap index 0e21bf5f..ce16019b 100644 --- a/helm/ingress-controller/tests/__snapshot__/controller-serviceaccount_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/controller-serviceaccount_test.yaml.snap @@ -7,9 +7,9 @@ Should match the snapshot: app.kubernetes.io/component: controller app.kubernetes.io/instance: test-release app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubernetes-ingress-controller - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/version: 0.12.0 - helm.sh/chart: kubernetes-ingress-controller-0.14.0 - name: test-release-kubernetes-ingress-controller + helm.sh/chart: ngrok-operator-0.14.0 + name: test-release-ngrok-operator namespace: test-namespace diff --git a/helm/ingress-controller/tests/__snapshot__/credentials-secret_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/credentials-secret_test.yaml.snap index f75123de..6619843a 100644 --- a/helm/ingress-controller/tests/__snapshot__/credentials-secret_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/credentials-secret_test.yaml.snap @@ -6,6 +6,6 @@ Should match snapshot: AUTHTOKEN: dGVzdC1hdXRodG9rZW4= kind: Secret metadata: - name: RELEASE-NAME-kubernetes-ingress-controller-credentials + name: RELEASE-NAME-ngrok-operator-credentials namespace: NAMESPACE type: Opaque diff --git a/helm/ingress-controller/tests/__snapshot__/ingress-class_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/ingress-class_test.yaml.snap index 675610ae..aa6d4f9c 100644 --- a/helm/ingress-controller/tests/__snapshot__/ingress-class_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/ingress-class_test.yaml.snap @@ -7,10 +7,10 @@ Should match snapshot: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubernetes-ingress-controller - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/version: 0.12.0 - helm.sh/chart: kubernetes-ingress-controller-0.14.0 + helm.sh/chart: ngrok-operator-0.14.0 name: ngrok spec: controller: k8s.ngrok.com/ingress-controller diff --git a/helm/ingress-controller/tests/controller-cm_test.yaml b/helm/ingress-controller/tests/controller-cm_test.yaml index be83fd98..d6f4a073 100644 --- a/helm/ingress-controller/tests/controller-cm_test.yaml +++ b/helm/ingress-controller/tests/controller-cm_test.yaml @@ -27,11 +27,11 @@ tests: asserts: - equal: path: metadata.name - value: test-release-kubernetes-ingress-controller-manager-config + value: test-release-ngrok-operator-config - it: Works when fullname is supplied set: fullnameOverride: fno asserts: - equal: path: metadata.name - value: fno-manager-config + value: fno-config diff --git a/helm/ingress-controller/tests/controller-deployment_test.yaml b/helm/ingress-controller/tests/controller-deployment_test.yaml index 15d341e6..7d274475 100644 --- a/helm/ingress-controller/tests/controller-deployment_test.yaml +++ b/helm/ingress-controller/tests/controller-deployment_test.yaml @@ -129,7 +129,7 @@ tests: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME - app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator topologyKey: kubernetes.io/hostname weight: 1 - it: Easily allows for setting a "hard" pod anti-affinity @@ -146,7 +146,7 @@ tests: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME - app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator topologyKey: kubernetes.io/hostname - it: Allows overriding the full affinity template: controller-deployment.yaml diff --git a/helm/ingress-controller/values.yaml b/helm/ingress-controller/values.yaml index 88c0b7c5..1f4633f0 100644 --- a/helm/ingress-controller/values.yaml +++ b/helm/ingress-controller/values.yaml @@ -32,7 +32,7 @@ replicaCount: 1 ## @param image.pullSecrets An array of imagePullSecrets to be used when pulling the image. image: registry: docker.io - repository: ngrok/kubernetes-ingress-controller + repository: ngrok/ngrok-operator tag: "" pullPolicy: IfNotPresent ## Example diff --git a/internal/annotations/annotations.go b/internal/annotations/annotations.go index e927f233..3e4b6950 100644 --- a/internal/annotations/annotations.go +++ b/internal/annotations/annotations.go @@ -20,14 +20,14 @@ import ( "fmt" "github.com/imdario/mergo" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/compression" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/headers" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/ip_policies" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/tls" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/webhook_verification" - "github.com/ngrok/kubernetes-ingress-controller/internal/errors" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/annotations/compression" + "github.com/ngrok/ngrok-operator/internal/annotations/headers" + "github.com/ngrok/ngrok-operator/internal/annotations/ip_policies" + "github.com/ngrok/ngrok-operator/internal/annotations/parser" + "github.com/ngrok/ngrok-operator/internal/annotations/tls" + "github.com/ngrok/ngrok-operator/internal/annotations/webhook_verification" + "github.com/ngrok/ngrok-operator/internal/errors" networking "k8s.io/api/networking/v1" "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/annotations/compression/compression.go b/internal/annotations/compression/compression.go index cbeea63d..a6c20c84 100644 --- a/internal/annotations/compression/compression.go +++ b/internal/annotations/compression/compression.go @@ -1,8 +1,8 @@ package compression import ( - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/annotations/parser" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/annotations/compression/compression_test.go b/internal/annotations/compression/compression_test.go index cfae5ed5..90fe0cb7 100644 --- a/internal/annotations/compression/compression_test.go +++ b/internal/annotations/compression/compression_test.go @@ -3,10 +3,10 @@ package compression import ( "testing" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/testutil" - "github.com/ngrok/kubernetes-ingress-controller/internal/errors" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/annotations/parser" + "github.com/ngrok/ngrok-operator/internal/annotations/testutil" + "github.com/ngrok/ngrok-operator/internal/errors" "github.com/stretchr/testify/assert" ) diff --git a/internal/annotations/headers/headers.go b/internal/annotations/headers/headers.go index a1c0ac88..895f1369 100644 --- a/internal/annotations/headers/headers.go +++ b/internal/annotations/headers/headers.go @@ -1,9 +1,9 @@ package headers import ( - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" - "github.com/ngrok/kubernetes-ingress-controller/internal/errors" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/annotations/parser" + "github.com/ngrok/ngrok-operator/internal/errors" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/annotations/headers/headers_test.go b/internal/annotations/headers/headers_test.go index 55a22ee6..17f9a906 100644 --- a/internal/annotations/headers/headers_test.go +++ b/internal/annotations/headers/headers_test.go @@ -3,9 +3,9 @@ package headers import ( "testing" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/testutil" - "github.com/ngrok/kubernetes-ingress-controller/internal/errors" + "github.com/ngrok/ngrok-operator/internal/annotations/parser" + "github.com/ngrok/ngrok-operator/internal/annotations/testutil" + "github.com/ngrok/ngrok-operator/internal/errors" "github.com/stretchr/testify/assert" ) diff --git a/internal/annotations/ip_policies/ip_policy.go b/internal/annotations/ip_policies/ip_policy.go index cb5e0652..6d1747c9 100644 --- a/internal/annotations/ip_policies/ip_policy.go +++ b/internal/annotations/ip_policies/ip_policy.go @@ -1,8 +1,8 @@ package ip_policies import ( - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/annotations/parser" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/annotations/ip_policies/ip_policy_test.go b/internal/annotations/ip_policies/ip_policy_test.go index 9a08ad72..fb85ff46 100644 --- a/internal/annotations/ip_policies/ip_policy_test.go +++ b/internal/annotations/ip_policies/ip_policy_test.go @@ -3,9 +3,9 @@ package ip_policies import ( "testing" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/testutil" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/annotations/parser" + "github.com/ngrok/ngrok-operator/internal/annotations/testutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/annotations/parser/parser.go b/internal/annotations/parser/parser.go index f66ea0ee..c08c39a1 100644 --- a/internal/annotations/parser/parser.go +++ b/internal/annotations/parser/parser.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "github.com/ngrok/kubernetes-ingress-controller/internal/errors" + "github.com/ngrok/ngrok-operator/internal/errors" "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/annotations/tls/tls.go b/internal/annotations/tls/tls.go index 92ef2eeb..6fd316f8 100644 --- a/internal/annotations/tls/tls.go +++ b/internal/annotations/tls/tls.go @@ -1,8 +1,8 @@ package tls import ( - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/annotations/parser" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/annotations/tls/tls_test.go b/internal/annotations/tls/tls_test.go index 478260a2..ba9edaf2 100644 --- a/internal/annotations/tls/tls_test.go +++ b/internal/annotations/tls/tls_test.go @@ -3,9 +3,9 @@ package tls import ( "testing" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/testutil" - "github.com/ngrok/kubernetes-ingress-controller/internal/errors" + "github.com/ngrok/ngrok-operator/internal/annotations/parser" + "github.com/ngrok/ngrok-operator/internal/annotations/testutil" + "github.com/ngrok/ngrok-operator/internal/errors" "github.com/stretchr/testify/assert" ) diff --git a/internal/annotations/webhook_verification/webhook_verification.go b/internal/annotations/webhook_verification/webhook_verification.go index d83db1b0..5313e861 100644 --- a/internal/annotations/webhook_verification/webhook_verification.go +++ b/internal/annotations/webhook_verification/webhook_verification.go @@ -1,8 +1,8 @@ package webhook_verification import ( - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/annotations/parser" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/annotations/webhook_verification/webhook_verification_test.go b/internal/annotations/webhook_verification/webhook_verification_test.go index 017cb2c3..38b45a60 100644 --- a/internal/annotations/webhook_verification/webhook_verification_test.go +++ b/internal/annotations/webhook_verification/webhook_verification_test.go @@ -3,10 +3,10 @@ package webhook_verification import ( "testing" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/testutil" - "github.com/ngrok/kubernetes-ingress-controller/internal/errors" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/annotations/parser" + "github.com/ngrok/ngrok-operator/internal/annotations/testutil" + "github.com/ngrok/ngrok-operator/internal/errors" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/controllers/resolvers.go b/internal/controller/controllers/resolvers.go index 52ca4d27..caa3e138 100644 --- a/internal/controller/controllers/resolvers.go +++ b/internal/controller/controllers/resolvers.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/controller/gateway/gateway_controller.go b/internal/controller/gateway/gateway_controller.go index 662c3294..01fc7811 100644 --- a/internal/controller/gateway/gateway_controller.go +++ b/internal/controller/gateway/gateway_controller.go @@ -34,9 +34,9 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/controller/controllers" - "github.com/ngrok/kubernetes-ingress-controller/internal/store" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/controller/controllers" + "github.com/ngrok/ngrok-operator/internal/store" ) const ( diff --git a/internal/controller/gateway/httproute_controller.go b/internal/controller/gateway/httproute_controller.go index 16ad9543..1376f9cb 100644 --- a/internal/controller/gateway/httproute_controller.go +++ b/internal/controller/gateway/httproute_controller.go @@ -35,9 +35,9 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/controller/controllers" - "github.com/ngrok/kubernetes-ingress-controller/internal/store" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/controller/controllers" + "github.com/ngrok/ngrok-operator/internal/store" ) // HTTPRouteReconciler reconciles a HTTPRoute object diff --git a/internal/controller/ingress/base_controller.go b/internal/controller/ingress/base_controller.go index 0d917848..8afc4e26 100644 --- a/internal/controller/ingress/base_controller.go +++ b/internal/controller/ingress/base_controller.go @@ -8,8 +8,8 @@ import ( "time" "github.com/go-logr/logr" - "github.com/ngrok/kubernetes-ingress-controller/internal/controller/controllers" "github.com/ngrok/ngrok-api-go/v5" + "github.com/ngrok/ngrok-operator/internal/controller/controllers" v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" diff --git a/internal/controller/ingress/domain_controller.go b/internal/controller/ingress/domain_controller.go index 35b923d2..022e30ac 100644 --- a/internal/controller/ingress/domain_controller.go +++ b/internal/controller/ingress/domain_controller.go @@ -36,9 +36,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/ngrok-api-go/v5" "github.com/ngrok/ngrok-api-go/v5/reserved_domains" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" ) // DomainReconciler reconciles a Domain object diff --git a/internal/controller/ingress/httpsedge_controller.go b/internal/controller/ingress/httpsedge_controller.go index 0dfa4aa9..3ba9f121 100644 --- a/internal/controller/ingress/httpsedge_controller.go +++ b/internal/controller/ingress/httpsedge_controller.go @@ -43,12 +43,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/controller/controllers" - ierr "github.com/ngrok/kubernetes-ingress-controller/internal/errors" - "github.com/ngrok/kubernetes-ingress-controller/internal/ngrokapi" "github.com/ngrok/ngrok-api-go/v5" "github.com/ngrok/ngrok-api-go/v5/backends/tunnel_group" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/controller/controllers" + ierr "github.com/ngrok/ngrok-operator/internal/errors" + "github.com/ngrok/ngrok-operator/internal/ngrokapi" ) type routeModuleComparision string @@ -223,7 +223,7 @@ func (r *HTTPSEdgeReconciler) reconcileRoutes(ctx context.Context, edge *ingress // It's important to note here that we are intentionally ommiting the `route.Backend` for new routes. // The success or failure of applying a route's modules is then strongly linked the state of its backend. // Thus, any route with a backend is considered properly configured. - // See https://github.com/ngrok/kubernetes-ingress-controller/issues/208 for additional context. + // See https://github.com/ngrok/ngrok-operator/issues/208 for additional context. if match == nil { routeLog.Info("Creating new route") req := &ngrok.HTTPSEdgeRouteCreate{ diff --git a/internal/controller/ingress/httpsedge_controller_test.go b/internal/controller/ingress/httpsedge_controller_test.go index b2a4263f..e7df0def 100644 --- a/internal/controller/ingress/httpsedge_controller_test.go +++ b/internal/controller/ingress/httpsedge_controller_test.go @@ -3,8 +3,8 @@ package controllers import ( "testing" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/ngrok-api-go/v5" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/internal/controller/ingress/ingress_controller.go b/internal/controller/ingress/ingress_controller.go index 88c4dfcd..1ed04b8a 100644 --- a/internal/controller/ingress/ingress_controller.go +++ b/internal/controller/ingress/ingress_controller.go @@ -4,12 +4,12 @@ import ( "context" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - ngrokv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations" - "github.com/ngrok/kubernetes-ingress-controller/internal/controller/controllers" - internalerrors "github.com/ngrok/kubernetes-ingress-controller/internal/errors" - "github.com/ngrok/kubernetes-ingress-controller/internal/store" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + ngrokv1alpha1 "github.com/ngrok/ngrok-operator/api/ngrok/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/annotations" + "github.com/ngrok/ngrok-operator/internal/controller/controllers" + internalerrors "github.com/ngrok/ngrok-operator/internal/errors" + "github.com/ngrok/ngrok-operator/internal/store" corev1 "k8s.io/api/core/v1" netv1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/controller/ingress/ippolicy_controller.go b/internal/controller/ingress/ippolicy_controller.go index 5e5d5709..550eb418 100644 --- a/internal/controller/ingress/ippolicy_controller.go +++ b/internal/controller/ingress/ippolicy_controller.go @@ -36,10 +36,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/ngrok-api-go/v5" "github.com/ngrok/ngrok-api-go/v5/ip_policies" "github.com/ngrok/ngrok-api-go/v5/ip_policy_rules" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" ) const ( diff --git a/internal/controller/ingress/ippolicy_controllers_test.go b/internal/controller/ingress/ippolicy_controllers_test.go index 4bc7c695..c0bbfb5b 100644 --- a/internal/controller/ingress/ippolicy_controllers_test.go +++ b/internal/controller/ingress/ippolicy_controllers_test.go @@ -3,8 +3,8 @@ package controllers import ( "testing" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/ngrok-api-go/v5" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" "github.com/stretchr/testify/assert" "k8s.io/utils/ptr" ) diff --git a/internal/controller/ingress/moduleset_controller.go b/internal/controller/ingress/moduleset_controller.go index 01d47125..68fa3181 100644 --- a/internal/controller/ingress/moduleset_controller.go +++ b/internal/controller/ingress/moduleset_controller.go @@ -4,8 +4,8 @@ import ( "context" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/store" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/store" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" diff --git a/internal/controller/ingress/service_controller.go b/internal/controller/ingress/service_controller.go index 0fdd0623..47efed1e 100644 --- a/internal/controller/ingress/service_controller.go +++ b/internal/controller/ingress/service_controller.go @@ -31,13 +31,13 @@ import ( "time" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - ngrokv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" - "github.com/ngrok/kubernetes-ingress-controller/internal/controller/controllers" - "github.com/ngrok/kubernetes-ingress-controller/internal/errors" - "github.com/ngrok/kubernetes-ingress-controller/internal/store" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + ngrokv1alpha1 "github.com/ngrok/ngrok-operator/api/ngrok/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/annotations" + "github.com/ngrok/ngrok-operator/internal/annotations/parser" + "github.com/ngrok/ngrok-operator/internal/controller/controllers" + "github.com/ngrok/ngrok-operator/internal/errors" + "github.com/ngrok/ngrok-operator/internal/store" "golang.org/x/sync/errgroup" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controller/ingress/tcpedge_controller.go b/internal/controller/ingress/tcpedge_controller.go index 200f54e4..e224d364 100644 --- a/internal/controller/ingress/tcpedge_controller.go +++ b/internal/controller/ingress/tcpedge_controller.go @@ -43,10 +43,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/controller/controllers" - "github.com/ngrok/kubernetes-ingress-controller/internal/ngrokapi" "github.com/ngrok/ngrok-api-go/v5" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/controller/controllers" + "github.com/ngrok/ngrok-operator/internal/ngrokapi" ) // TCPEdgeReconciler reconciles a TCPEdge object diff --git a/internal/controller/ingress/tlsedge_controller.go b/internal/controller/ingress/tlsedge_controller.go index e04b42bd..f80f2371 100644 --- a/internal/controller/ingress/tlsedge_controller.go +++ b/internal/controller/ingress/tlsedge_controller.go @@ -44,11 +44,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/controller/controllers" - ierr "github.com/ngrok/kubernetes-ingress-controller/internal/errors" - "github.com/ngrok/kubernetes-ingress-controller/internal/ngrokapi" "github.com/ngrok/ngrok-api-go/v5" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/controller/controllers" + ierr "github.com/ngrok/ngrok-operator/internal/errors" + "github.com/ngrok/ngrok-operator/internal/ngrokapi" ) // TLSEdgeReconciler reconciles a TLSEdge object diff --git a/internal/controller/ingress/tunnel_controller.go b/internal/controller/ingress/tunnel_controller.go index 38b6c03c..692949a5 100644 --- a/internal/controller/ingress/tunnel_controller.go +++ b/internal/controller/ingress/tunnel_controller.go @@ -29,8 +29,8 @@ import ( "fmt" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/pkg/tunneldriver" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/pkg/tunneldriver" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" "k8s.io/utils/ptr" diff --git a/internal/controller/ngrok/ngroktrafficpolicy_controller.go b/internal/controller/ngrok/ngroktrafficpolicy_controller.go index 847e7826..dd0b5e92 100644 --- a/internal/controller/ngrok/ngroktrafficpolicy_controller.go +++ b/internal/controller/ngrok/ngroktrafficpolicy_controller.go @@ -28,8 +28,8 @@ import ( "context" "github.com/go-logr/logr" - ngrokv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/store" + ngrokv1alpha1 "github.com/ngrok/ngrok-operator/api/ngrok/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/store" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" diff --git a/internal/mocks/dialer.go b/internal/mocks/dialer.go index 155f7c62..d80a1564 100644 --- a/internal/mocks/dialer.go +++ b/internal/mocks/dialer.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ngrok/kubernetes-ingress-controller/pkg/tunneldriver (interfaces: Dialer) +// Source: github.com/ngrok/ngrok-operator/pkg/tunneldriver (interfaces: Dialer) // Package mocks is a generated GoMock package. package mocks diff --git a/internal/mocks/gen.go b/internal/mocks/gen.go index 29a772ca..8c1cbe0f 100644 --- a/internal/mocks/gen.go +++ b/internal/mocks/gen.go @@ -4,4 +4,4 @@ package mocks //go:generate go run github.com/golang/mock/mockgen -package mocks -destination tunnel.go golang.ngrok.com/ngrok Tunnel -//go:generate go run github.com/golang/mock/mockgen -package mocks -destination dialer.go github.com/ngrok/kubernetes-ingress-controller/pkg/tunneldriver Dialer +//go:generate go run github.com/golang/mock/mockgen -package mocks -destination dialer.go github.com/ngrok/ngrok-operator/pkg/tunneldriver Dialer diff --git a/internal/store/cachestores.go b/internal/store/cachestores.go index fd5d226a..50c18a7f 100644 --- a/internal/store/cachestores.go +++ b/internal/store/cachestores.go @@ -19,8 +19,8 @@ import ( "sync" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - ngrokv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + ngrokv1alpha1 "github.com/ngrok/ngrok-operator/api/ngrok/v1alpha1" corev1 "k8s.io/api/core/v1" netv1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/store/driver.go b/internal/store/driver.go index c4279fc9..2dd16cb4 100644 --- a/internal/store/driver.go +++ b/internal/store/driver.go @@ -20,11 +20,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - ngrokv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + ngrokv1alpha1 "github.com/ngrok/ngrok-operator/api/ngrok/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/annotations" - "github.com/ngrok/kubernetes-ingress-controller/internal/errors" + "github.com/ngrok/ngrok-operator/internal/annotations" + "github.com/ngrok/ngrok-operator/internal/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -77,7 +77,7 @@ func NewDriver(logger logr.Logger, scheme *runtime.Scheme, controllerName string // WithMetaData allows you to pass in custom metadata to be added to all resources created by the controller func (d *Driver) WithMetaData(customMetadata map[string]string) *Driver { - ingressMetadata, err := d.setMetadataOwner("kubernetes-ingress-controller", customMetadata) + ingressMetadata, err := d.setMetadataOwner("ngrok-operator", customMetadata) if err != nil { d.log.Error(err, "error marshalling custom metadata", "customMetadata", d.ingressMetadata) return d diff --git a/internal/store/driver_test.go b/internal/store/driver_test.go index b832fdc0..6095183b 100644 --- a/internal/store/driver_test.go +++ b/internal/store/driver_test.go @@ -17,11 +17,11 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - ngrokv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + ngrokv1alpha1 "github.com/ngrok/ngrok-operator/api/ngrok/v1alpha1" ) -const defaultManagerName = "ngrok-ingress-controller" +const defaultManagerName = "ngrok-operator" var _ = Describe("Driver", func() { diff --git a/internal/store/store.go b/internal/store/store.go index afbd8a58..6cfca2c8 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -18,10 +18,10 @@ import ( "sort" "strings" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - ngrokv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + ngrokv1alpha1 "github.com/ngrok/ngrok-operator/api/ngrok/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/errors" + "github.com/ngrok/ngrok-operator/internal/errors" corev1 "k8s.io/api/core/v1" netv1 "k8s.io/api/networking/v1" diff --git a/internal/store/store_test.go b/internal/store/store_test.go index c5773cbf..ef1a7de1 100644 --- a/internal/store/store_test.go +++ b/internal/store/store_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/go-logr/logr" - "github.com/ngrok/kubernetes-ingress-controller/internal/errors" + "github.com/ngrok/ngrok-operator/internal/errors" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" netv1 "k8s.io/api/networking/v1" diff --git a/internal/store/testutility.go b/internal/store/testutility.go index 691094e1..26907356 100644 --- a/internal/store/testutility.go +++ b/internal/store/testutility.go @@ -3,8 +3,8 @@ package store import ( "encoding/json" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - ngrokv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ngrok/v1alpha1" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + ngrokv1alpha1 "github.com/ngrok/ngrok-operator/api/ngrok/v1alpha1" corev1 "k8s.io/api/core/v1" netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/version/version.go b/internal/version/version.go index f6f7700b..ab0f3389 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -6,7 +6,7 @@ import ( ) var ( - // version of the ngrok kubernetes-ingress-controller. + // version of the ngrok ngrok-operator. // Injected at build time via LDFlags. version = "0.0.0" @@ -32,7 +32,7 @@ func GetVersion() string { // GetUserAgent returns a user agent to use func GetUserAgent() string { - return fmt.Sprintf("ngrok-ingress-controller/%s", GetVersion()) + return fmt.Sprintf("ngrok-operator/%s", GetVersion()) } // Get returns build info diff --git a/manifest-bundle.yaml b/manifest-bundle.yaml index 93cd8c4a..afc70c60 100644 --- a/manifest-bundle.yaml +++ b/manifest-bundle.yaml @@ -1,36 +1,36 @@ --- -# Source: kubernetes-ingress-controller/templates/controller-serviceaccount.yaml +# Source: ngrok-operator/templates/controller-serviceaccount.yaml apiVersion: v1 kind: ServiceAccount metadata: name: ingress-controller-kubernetes-ingress-controller - namespace: ngrok-ingress-controller + namespace: ngrok-operator labels: - helm.sh/chart: kubernetes-ingress-controller-0.5.0 - app.kubernetes.io/name: kubernetes-ingress-controller + helm.sh/chart: ngrok-operator-0.5.0 + app.kubernetes.io/name: ngrok-operator app.kubernetes.io/instance: ingress-controller app.kubernetes.io/version: "0.3.0" - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller --- -# Source: kubernetes-ingress-controller/templates/agent-config-cm.yaml +# Source: ngrok-operator/templates/agent-config-cm.yaml apiVersion: v1 kind: ConfigMap metadata: name: ingress-controller-kubernetes-ingress-controller-agent-cm - namespace: ngrok-ingress-controller + namespace: ngrok-operator data: METADATA: "" REGION: "" REMOTE_MANAGEMENT: "" --- -# Source: kubernetes-ingress-controller/templates/controller-cm.yaml +# Source: ngrok-operator/templates/controller-cm.yaml apiVersion: v1 kind: ConfigMap metadata: - name: ingress-controller-kubernetes-ingress-controller-manager-config - namespace: ngrok-ingress-controller + name: ingress-controller-kubernetes-ingress-controller-config + namespace: ngrok-operator data: controller_manager_config.yaml: | apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 @@ -43,7 +43,7 @@ data: leaderElect: true resourceName: ingress-controller-kubernetes-ingress-controller-leader --- -# Source: kubernetes-ingress-controller/templates/crds/ingress.k8s.ngrok.com_domains.yaml +# Source: ngrok-operator/templates/crds/ingress.k8s.ngrok.com_domains.yaml apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -102,7 +102,7 @@ spec: description: DomainSpec defines the desired state of Domain properties: description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -110,7 +110,7 @@ spec: description: Domain is the domain name to reserve type: string metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string @@ -145,7 +145,7 @@ spec: subresources: status: {} --- -# Source: kubernetes-ingress-controller/templates/crds/ingress.k8s.ngrok.com_httpsedges.yaml +# Source: ngrok-operator/templates/crds/ingress.k8s.ngrok.com_httpsedges.yaml apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -183,7 +183,7 @@ spec: description: HTTPSEdgeSpec defines the desired state of HTTPSEdge properties: description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -193,7 +193,7 @@ spec: type: string type: array metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string @@ -206,7 +206,7 @@ spec: backend that serves traffic for this edge properties: description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -216,7 +216,7 @@ spec: description: Labels to watch for tunnels on this backend type: object metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string @@ -231,7 +231,7 @@ spec: type: boolean type: object description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -298,7 +298,7 @@ spec: - path_prefix type: string metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string @@ -378,7 +378,7 @@ spec: subresources: status: {} --- -# Source: kubernetes-ingress-controller/templates/crds/ingress.k8s.ngrok.com_ippolicies.yaml +# Source: ngrok-operator/templates/crds/ingress.k8s.ngrok.com_ippolicies.yaml apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -425,12 +425,12 @@ spec: description: IPPolicySpec defines the desired state of IPPolicy properties: description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string @@ -443,12 +443,12 @@ spec: cidr: type: string description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string @@ -481,7 +481,7 @@ spec: subresources: status: {} --- -# Source: kubernetes-ingress-controller/templates/crds/ingress.k8s.ngrok.com_tcpedges.yaml +# Source: ngrok-operator/templates/crds/ingress.k8s.ngrok.com_tcpedges.yaml apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -540,7 +540,7 @@ spec: that serves traffic for this edge properties: description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -550,13 +550,13 @@ spec: description: Labels to watch for tunnels on this backend type: object metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string type: object description: - default: Created by kubernetes-ingress-controller + default: Created by ngrok-operator description: Description is a human-readable description of the object in the ngrok API/Dashboard type: string @@ -569,7 +569,7 @@ spec: type: array type: object metadata: - default: '{"owned-by":"kubernetes-ingress-controller"}' + default: '{"owned-by":"ngrok-operator"}' description: Metadata is a string of arbitrary data associated with the object in the ngrok API/Dashboard type: string @@ -603,7 +603,7 @@ spec: subresources: status: {} --- -# Source: kubernetes-ingress-controller/templates/crds/ingress.k8s.ngrok.com_tunnels.yaml +# Source: ngrok-operator/templates/crds/ingress.k8s.ngrok.com_tunnels.yaml apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: @@ -668,11 +668,11 @@ spec: subresources: status: {} --- -# Source: kubernetes-ingress-controller/templates/controller-rbac.yaml +# Source: ngrok-operator/templates/controller-rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: ngrok-ingress-controller-proxy-role + name: ngrok-operator-proxy-role rules: - apiGroups: - authentication.k8s.io @@ -687,17 +687,17 @@ rules: verbs: - create --- -# Source: kubernetes-ingress-controller/templates/rbac/domain_editor_role.yaml +# Source: ngrok-operator/templates/rbac/domain_editor_role.yaml # permissions for end users to edit domains. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kubernetes-ingress-controller-0.5.0 - app.kubernetes.io/name: kubernetes-ingress-controller + helm.sh/chart: ngrok-operator-0.5.0 + app.kubernetes.io/name: ngrok-operator app.kubernetes.io/instance: ingress-controller app.kubernetes.io/version: "0.3.0" - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: rbac name: ingress-controller-kubernetes-ingress-controller-domain-editor-role @@ -721,17 +721,17 @@ rules: verbs: - get --- -# Source: kubernetes-ingress-controller/templates/rbac/domain_viewer_role.yaml +# Source: ngrok-operator/templates/rbac/domain_viewer_role.yaml # permissions for end users to view domains. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kubernetes-ingress-controller-0.5.0 - app.kubernetes.io/name: kubernetes-ingress-controller + helm.sh/chart: ngrok-operator-0.5.0 + app.kubernetes.io/name: ngrok-operator app.kubernetes.io/instance: ingress-controller app.kubernetes.io/version: "0.3.0" - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: rbac name: ingress-controller-kubernetes-ingress-controller-domain-viewer-role @@ -751,7 +751,7 @@ rules: verbs: - get --- -# Source: kubernetes-ingress-controller/templates/rbac/httpsedge_editor_role.yaml +# Source: ngrok-operator/templates/rbac/httpsedge_editor_role.yaml # permissions for end users to edit httpsedges. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -760,8 +760,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: httpsedge-editor-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: httpsedge-editor-role rules: @@ -784,7 +784,7 @@ rules: verbs: - get --- -# Source: kubernetes-ingress-controller/templates/rbac/httpsedge_viewer_role.yaml +# Source: ngrok-operator/templates/rbac/httpsedge_viewer_role.yaml # permissions for end users to view httpsedges. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -793,8 +793,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: httpsedge-viewer-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: httpsedge-viewer-role rules: @@ -813,7 +813,7 @@ rules: verbs: - get --- -# Source: kubernetes-ingress-controller/templates/rbac/ippolicy_editor_role.yaml +# Source: ngrok-operator/templates/rbac/ippolicy_editor_role.yaml # permissions for end users to edit ippolicies. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -822,8 +822,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: ippolicy-editor-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: ippolicy-editor-role rules: @@ -846,7 +846,7 @@ rules: verbs: - get --- -# Source: kubernetes-ingress-controller/templates/rbac/ippolicy_viewer_role.yaml +# Source: ngrok-operator/templates/rbac/ippolicy_viewer_role.yaml # permissions for end users to view ippolicies. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -855,8 +855,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: ippolicy-viewer-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: ippolicy-viewer-role rules: @@ -875,12 +875,12 @@ rules: verbs: - get --- -# Source: kubernetes-ingress-controller/templates/rbac/role.yaml +# Source: ngrok-operator/templates/rbac/role.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: creationTimestamp: null - name: ngrok-ingress-controller-manager-role + name: ngrok-operator-role rules: - apiGroups: - "" @@ -1065,7 +1065,7 @@ rules: - update - watch --- -# Source: kubernetes-ingress-controller/templates/rbac/tcpedge_editor_role.yaml +# Source: ngrok-operator/templates/rbac/tcpedge_editor_role.yaml # permissions for end users to edit tcpedges. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -1074,8 +1074,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: tcpedge-editor-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: tcpedge-editor-role rules: @@ -1098,7 +1098,7 @@ rules: verbs: - get --- -# Source: kubernetes-ingress-controller/templates/rbac/tcpedge_viewer_role.yaml +# Source: ngrok-operator/templates/rbac/tcpedge_viewer_role.yaml # permissions for end users to view tcpedges. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -1107,8 +1107,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: tcpedge-viewer-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller + app.kubernetes.io/created-by: ngrok-operator + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: kustomize name: tcpedge-viewer-role rules: @@ -1127,17 +1127,17 @@ rules: verbs: - get --- -# Source: kubernetes-ingress-controller/templates/rbac/tunnel_editor_role.yaml +# Source: ngrok-operator/templates/rbac/tunnel_editor_role.yaml # permissions for end users to edit tunnels. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kubernetes-ingress-controller-0.5.0 - app.kubernetes.io/name: kubernetes-ingress-controller + helm.sh/chart: ngrok-operator-0.5.0 + app.kubernetes.io/name: ngrok-operator app.kubernetes.io/instance: ingress-controller app.kubernetes.io/version: "0.3.0" - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: rbac name: ingress-controller-kubernetes-ingress-controller-tunnel-editor-role @@ -1161,17 +1161,17 @@ rules: verbs: - get --- -# Source: kubernetes-ingress-controller/templates/rbac/tunnel_viewer_role.yaml +# Source: ngrok-operator/templates/rbac/tunnel_viewer_role.yaml # permissions for end users to view tunnels. apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: kubernetes-ingress-controller-0.5.0 - app.kubernetes.io/name: kubernetes-ingress-controller + helm.sh/chart: ngrok-operator-0.5.0 + app.kubernetes.io/name: ngrok-operator app.kubernetes.io/instance: ingress-controller app.kubernetes.io/version: "0.3.0" - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: rbac name: ingress-controller-kubernetes-ingress-controller-tunnel-viewer-role @@ -1191,40 +1191,40 @@ rules: verbs: - get --- -# Source: kubernetes-ingress-controller/templates/controller-rbac.yaml +# Source: ngrok-operator/templates/controller-rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ngrok-ingress-controller-manager-rolebinding + name: ngrok-operator-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: ngrok-ingress-controller-manager-role + name: ngrok-operator-role subjects: - kind: ServiceAccount name: ingress-controller-kubernetes-ingress-controller - namespace: ngrok-ingress-controller + namespace: ngrok-operator --- -# Source: kubernetes-ingress-controller/templates/controller-rbac.yaml +# Source: ngrok-operator/templates/controller-rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ngrok-ingress-controller-proxy-rolebinding + name: ngrok-operator-proxy-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: ngrok-ingress-controller-proxy-role + name: ngrok-operator-proxy-role subjects: - kind: ServiceAccount name: ingress-controller-kubernetes-ingress-controller - namespace: ngrok-ingress-controller + namespace: ngrok-operator --- -# Source: kubernetes-ingress-controller/templates/controller-rbac.yaml +# Source: ngrok-operator/templates/controller-rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: ngrok-ingress-controller-leader-election-role - namespace: ngrok-ingress-controller + name: ngrok-operator-leader-election-role + namespace: ngrok-operator rules: - apiGroups: - "" @@ -1258,35 +1258,35 @@ rules: - create - patch --- -# Source: kubernetes-ingress-controller/templates/controller-rbac.yaml +# Source: ngrok-operator/templates/controller-rbac.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: ngrok-ingress-controller-leader-election-rolebinding - namespace: ngrok-ingress-controller + name: ngrok-operator-leader-election-rolebinding + namespace: ngrok-operator roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: ngrok-ingress-controller-leader-election-role + name: ngrok-operator-leader-election-role subjects: - kind: ServiceAccount name: ingress-controller-kubernetes-ingress-controller - namespace: ngrok-ingress-controller + namespace: ngrok-operator --- -# Source: kubernetes-ingress-controller/templates/controller-deployment.yaml +# Source: ngrok-operator/templates/controller-deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: labels: - helm.sh/chart: kubernetes-ingress-controller-0.5.0 - app.kubernetes.io/name: kubernetes-ingress-controller + helm.sh/chart: ngrok-operator-0.5.0 + app.kubernetes.io/name: ngrok-operator app.kubernetes.io/instance: ingress-controller app.kubernetes.io/version: "0.3.0" - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller - name: ingress-controller-kubernetes-ingress-controller-manager - namespace: ngrok-ingress-controller + name: ingress-controller-kubernetes-ingress-controller + namespace: ngrok-operator annotations: checksum/agent-config: 1012a0f3f4132751a558b1db2df58aab89fc9cf8a7f75a51ab84ffecf7ec9d71 checksum/controller-role: e82dcab3ad4d03739f251c7b07a2af02c401d664726314ec52eefc966f8d7c60 @@ -1295,7 +1295,7 @@ spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator app.kubernetes.io/instance: ingress-controller app.kubernetes.io/component: controller template: @@ -1306,14 +1306,14 @@ spec: prometheus.io/port: '8080' prometheus.io/scrape: 'true' labels: - app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/name: ngrok-operator app.kubernetes.io/instance: ingress-controller app.kubernetes.io/component: controller spec: serviceAccountName: ingress-controller-kubernetes-ingress-controller containers: - - name: ngrok-ingress-controller - image: docker.io/ngrok/kubernetes-ingress-controller:latest + - name: ngrok-operator + image: docker.io/ngrok/ngrok-operator:latest imagePullPolicy: IfNotPresent command: - /manager @@ -1328,12 +1328,12 @@ spec: valueFrom: secretKeyRef: key: API_KEY - name: ngrok-ingress-controller-credentials + name: ngrok-operator-credentials - name: NGROK_AUTHTOKEN valueFrom: secretKeyRef: key: AUTHTOKEN - name: ngrok-ingress-controller-credentials + name: ngrok-operator-credentials - name: POD_NAMESPACE valueFrom: fieldRef: @@ -1354,16 +1354,16 @@ spec: limits: {} requests: {} --- -# Source: kubernetes-ingress-controller/templates/ingress-class.yaml +# Source: ngrok-operator/templates/ingress-class.yaml apiVersion: networking.k8s.io/v1 kind: IngressClass metadata: labels: - helm.sh/chart: kubernetes-ingress-controller-0.5.0 - app.kubernetes.io/name: kubernetes-ingress-controller + helm.sh/chart: ngrok-operator-0.5.0 + app.kubernetes.io/name: ngrok-operator app.kubernetes.io/instance: ingress-controller app.kubernetes.io/version: "0.3.0" - app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/part-of: ngrok-operator app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller name: ngrok diff --git a/pkg/tunneldriver/driver.go b/pkg/tunneldriver/driver.go index 4ea2f6b2..cc32bae9 100644 --- a/pkg/tunneldriver/driver.go +++ b/pkg/tunneldriver/driver.go @@ -15,8 +15,8 @@ import ( "sync/atomic" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" - "github.com/ngrok/kubernetes-ingress-controller/internal/version" + ingressv1alpha1 "github.com/ngrok/ngrok-operator/api/ingress/v1alpha1" + "github.com/ngrok/ngrok-operator/internal/version" "golang.org/x/exp/maps" "golang.org/x/sync/errgroup" "sigs.k8s.io/controller-runtime/pkg/log" @@ -87,7 +87,7 @@ func New(ctx context.Context, logger logr.Logger, opts TunnelDriverOpts) (*Tunne } } connOpts := []ngrok.ConnectOption{ - ngrok.WithClientInfo("ngrok-ingress-controller", version.GetVersion(), comments...), + ngrok.WithClientInfo("ngrok-operator", version.GetVersion(), comments...), ngrok.WithAuthtokenFromEnv(), ngrok.WithLogger(k8sLogger{logger}), } diff --git a/pkg/tunneldriver/driver_test.go b/pkg/tunneldriver/driver_test.go index 21c21405..4c9037bd 100644 --- a/pkg/tunneldriver/driver_test.go +++ b/pkg/tunneldriver/driver_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/ngrok/kubernetes-ingress-controller/internal/mocks" + "github.com/ngrok/ngrok-operator/internal/mocks" ) func TestConnectionIsClosed(t *testing.T) { diff --git a/scripts/e2e.sh b/scripts/e2e.sh index 3c40aabc..0c345bd6 100755 --- a/scripts/e2e.sh +++ b/scripts/e2e.sh @@ -2,7 +2,7 @@ set -eu -o pipefail -namespace='ngrok-ingress-controller' +namespace='ngrok-operator' kubectl config set-context --current --namespace=$namespace # TODO: Use ngrok cli api to delete all edges owned by the ingress controller @@ -20,12 +20,12 @@ done ./scripts/cleanup-fixtures.sh -echo "~~~ Cleaning up previous deploy of ngrok-ingress-controller" +echo "~~~ Cleaning up previous deploy of ngrok-operator" make undeploy || true ./scripts/remove-finalizers.sh -echo "--- Deploying ngrok-ingress-controller" +echo "--- Deploying ngrok-operator" make deploy ./scripts/create-fixtures.sh diff --git a/scripts/postflight.sh b/scripts/postflight.sh index f831493f..0d153040 100755 --- a/scripts/postflight.sh +++ b/scripts/postflight.sh @@ -2,7 +2,7 @@ set -eu -o pipefail -namespace='ngrok-ingress-controller' +namespace='ngrok-operator' kubectl config set-context --current --namespace=$namespace # Run tests