diff --git a/.github/ISSUE_TEMPLATE/controller_bug_report.yaml b/.github/ISSUE_TEMPLATE/controller_bug_report.yaml index 081d449c..b0866c78 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/ngrok-ingress-controller/pulls) immediately instead. + You can open a [pull request](https://github.com/ngrok/kubernetes-ingress-controller/pulls) immediately instead. - type: textarea attributes: label: What happened diff --git a/.github/ISSUE_TEMPLATE/helm_bug_report.yaml b/.github/ISSUE_TEMPLATE/helm_bug_report.yaml index 175864a8..8088cb5f 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/ngrok-ingress-controller/pulls) immediately instead. + You can open a [pull request](https://github.com/ngrok/kubernetes-ingress-controller/pulls) immediately instead. - type: input attributes: label: Kubernetes Version diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 83c3293d..3760317f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -85,7 +85,7 @@ jobs: context: . platforms: ${{ steps.buildx-setup.outputs.platforms }} push: false - tags: ngrok/ngrok-ingress-controller:latest + tags: ngrok/kubernetes-ingress-controller:latest build: runs-on: ubuntu-latest diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index f57057b3..8bda9d44 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/ngrok-ingress-controller' + if: github.repository == 'ngrok/kubernetes-ingress-controller' steps: - name: Checkout repo uses: actions/checkout@v3 @@ -39,7 +39,7 @@ jobs: needs: - changes if: | - github.repository == 'ngrok/ngrok-ingress-controller' && + github.repository == 'ngrok/kubernetes-ingress-controller' && 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/ngrok-ingress-controller:latest + tags: ngrok/kubernetes-ingress-controller: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/ngrok-ingress-controller:${{ steps.extract_tag.outputs.tag }} + tags: ngrok/kubernetes-ingress-controller:${{ steps.extract_tag.outputs.tag }} - name: Create GitHub Release uses: actions/github-script@v6 if: ${{ needs.changes.outputs.tag == 'true' }} diff --git a/.github/workflows/helm_release.yaml b/.github/workflows/helm_release.yaml index 3c826b58..628bddd2 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/ngrok-ingress-controller' + if: github.repository == 'ngrok/kubernetes-ingress-controller' 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/ngrok-ingress-controller') && + (github.repository == 'ngrok/kubernetes-ingress-controller') && (needs.changes.outputs.charts == 'true') steps: - name: Checkout repo diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c0f1c3e..9885272a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,11 @@ 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). ## Unreleased + +## 0.3.0 ### Changed +- Renamed docker image from `ngrok/ngrok-ingress-controller` to `ngrok/kubernetes-ingress-controller`. +- Added new controllers for `domains`, `tcpedges`, and `httpsedges`. - Updated go dependencies - Moved `main.go` to root of project to match what `kubebuilder` expects. - Updated `Makefile` to match what `kubebuilder` currently outputs. diff --git a/Makefile b/Makefile index 503ddb96..678b930e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ngrok-ingress-controller +IMG ?= kubernetes-ingress-controller # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.23 diff --git a/PROJECT b/PROJECT index f2028853..4d3f59f7 100644 --- a/PROJECT +++ b/PROJECT @@ -1,8 +1,8 @@ domain: k8s.ngrok.com layout: - go.kubebuilder.io/v3 -projectName: ngrok-ingress-controller -repo: github.com/ngrok/ngrok-ingress-controller +projectName: kubernetes-ingress-controller +repo: github.com/ngrok/kubernetes-ingress-controller resources: - api: crdVersion: v1 @@ -11,7 +11,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: Domain - path: github.com/ngrok/ngrok-ingress-controller/api/v1alpha1 + path: github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -20,7 +20,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: Tunnel - path: github.com/ngrok/ngrok-ingress-controller/api/v1alpha1 + path: github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -29,7 +29,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: TCPEdge - path: github.com/ngrok/ngrok-ingress-controller/api/v1alpha1 + path: github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -38,6 +38,6 @@ resources: domain: k8s.ngrok.com group: ingress kind: HTTPSEdge - path: github.com/ngrok/ngrok-ingress-controller/api/v1alpha1 + path: github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1 version: v1alpha1 version: "3" diff --git a/README.md b/README.md index 0d5929f2..ae172e95 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@

- - CI Status + + CI Status

- + License @@ -62,8 +62,8 @@ export NGROK_AUTHTOKEN= Install via Helm: ```bash -helm repo add ngrok https://ngrok.github.io/ngrok-ingress-controller -helm install ngrok-ingress-controller ngrok/ngrok-ingress-controller \ +helm repo add ngrok https://ngrok.github.io/kubernetes-ingress-controller +helm install ngrok-ingress-controller ngrok/kubernetes-ingress-controller \ --namespace ngrok-ingress-controller \ --create-namespace \ --set credentials.apiKey=$(NGROK_API_KEY) \ @@ -121,14 +121,14 @@ data: Then when installing the controller via helm, you can pass the name of the secret to the controller via the `credentials.secret.name` helm value. ```bash -helm install ngrok-ingress-controller ngrok/ngrok-ingress-controller \ +helm install ngrok-ingress-controller ngrok/kubernetes-ingress-controller \ --set credentials.secret.name=ngrok-ingress-controller-credentials ``` ## How to Configure the Agent > Warning: This will be deprecated soon when moving to the new lib-ngrok library -* assumes configs will be in a config map named `{{ include "ngrok-ingress-controller.fullname" . }}-agent-cm` in the same namespace +* assumes configs will be in a config map named `{{ include "kubernetes-ingress-controller.fullname" . }}-agent-cm` in the same namespace * setup automatically via helm. Values and config map name can be configured in the future via helm * subset of these that should be configurable https://ngrok.com/docs/ngrok-agent/config#config-full-example * example config map showing all optional values with their defaults. @@ -137,7 +137,7 @@ helm install ngrok-ingress-controller ngrok/ngrok-ingress-controller \ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "ngrok-ingress-controller.fullname" . }}-agent-cm + name: {{ include "kubernetes-ingress-controller.fullname" . }}-agent-cm namespace: ngrok-ingress-controller data: METADATA: "{}" diff --git a/VERSION b/VERSION index 0ea3a944..0d91a54c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.0 +0.3.0 diff --git a/docs/releases.md b/docs/releases.md index 7b80ad2b..9e36262a 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -19,7 +19,7 @@ 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/ngrok-ingress-controller). We currently +Docker Hub [here](https://hub.docker.com/r/ngrok/kubernetes-ingress-controller). We currently support `amd64` and `arm64` architectures, with future plans to build for other architectures. ### Helm Chart @@ -64,13 +64,13 @@ to the semantic versioning spec as described above. Releases of the controller will be tagged with a prefix of `ngrok-ingress-controller-`. For example, version `1.2.0` of the docker image will have a git tag of `ngrok-ingress-controller-1.2.0` which -contains the code used to build the docker image `ngrok/ngrok-ingress-controller:1.2.0`. +contains the code used to build the docker image `ngrok/kubernetes-ingress-controller: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/ngrok-ingress-controller:latest` docker +will trigger. The workflow will build and publish the `ngrok/kubernetes-ingress-controller: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 `ngrok-ingress-controller-1.2.0` -and publish the docker image `ngrok/ngrok-ingress-controller:1.2.0`. +and publish the docker image `ngrok/kubernetes-ingress-controller:1.2.0`. diff --git a/go.mod b/go.mod index 4e68622e..d73b082b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ngrok/ngrok-ingress-controller +module github.com/ngrok/kubernetes-ingress-controller go 1.19 @@ -8,6 +8,7 @@ require ( github.com/ngrok/ngrok-api-go/v5 v5.0.0 github.com/spf13/cobra v1.6.1 github.com/stretchr/testify v1.8.1 + go.uber.org/zap v1.24.0 golang.ngrok.com/ngrok v0.0.0-20230105184634-66ddd48add80 golang.org/x/sync v0.1.0 k8s.io/api v0.26.0 @@ -77,7 +78,6 @@ require ( go.starlark.net v0.0.0-20230103143115-09991d3a103e // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.9.0 // indirect - go.uber.org/zap v1.24.0 // indirect golang.org/x/crypto v0.4.0 // indirect golang.org/x/mod v0.7.0 // indirect golang.org/x/net v0.5.0 // indirect diff --git a/helm/ingress-controller/CHANGELOG.md b/helm/ingress-controller/CHANGELOG.md index 0aeb3f46..a350e72a 100644 --- a/helm/ingress-controller/CHANGELOG.md +++ b/helm/ingress-controller/CHANGELOG.md @@ -5,6 +5,11 @@ 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.5.0 +### Changed +- Renamed chart from `ngrok-ingress-controller` to `kubernetes-ingress-controller`. +- Added CRDs for `domains`, `tcpedges`, and `httpsedges`. + ## 0.4.0 ### Added - `serverAddr` flag to override the ngrok tunnel server address diff --git a/helm/ingress-controller/Chart.yaml b/helm/ingress-controller/Chart.yaml index d6929f6b..75d21c20 100644 --- a/helm/ingress-controller/Chart.yaml +++ b/helm/ingress-controller/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -name: ngrok-ingress-controller +name: kubernetes-ingress-controller description: A Kubernetes ingress controller built using ngrok. -version: 0.4.0 -appVersion: 0.2.0 +version: 0.5.0 +appVersion: 0.3.0 keywords: - ngrok - networking @@ -11,5 +11,5 @@ keywords: - api gateway home: https://ngrok.com sources: - - https://github.com/ngrok/ngrok-ingress-controller + - https://github.com/ngrok/kubernetes-ingress-controller icon: https://blog.ngrok.com/_next/image?url=%2Fassets%2Fblog%2Fplaceholder.png&w=1920&q=75 diff --git a/helm/ingress-controller/README.md b/helm/ingress-controller/README.md index d389a685..717bacdd 100644 --- a/helm/ingress-controller/README.md +++ b/helm/ingress-controller/README.md @@ -24,7 +24,7 @@ the latest versions of the packages. You can then run `helm search repo ngrok` To install the ngrok-ingress-controller chart: -`helm install my-ngrok-ingress-controller ngrok/ngrok-ingress-controller` +`helm install my-ngrok-ingress-controller ngrok/kubernetes-ingress-controller` To uninstall the chart: @@ -45,29 +45,29 @@ To uninstall the chart: ### Controller parameters -| Name | Description | Value | -| ---------------------------- | --------------------------------------------------------------------------------------------------------------------- | -------------------------------- | -| `podAnnotations` | Used to inject custom annotations directly into | `{}` | -| `replicaCount` | The number of controllers and agents to run. | `1` | -| `image.registry` | The ngrok ingress controller image registry. | `docker.io` | -| `image.repository` | The ngrok ingress controller image repository. | `ngrok/ngrok-ingress-controller` | -| `image.tag` | The ngrok ingress controller image tag. | `latest` | -| `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. | `true` | -| `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 empty to utilize the global network | `""` | -| `serverAddr` | This is the URL of the ngrok server to connect to. You should set this if you are using a custom ingress URL. | `""` | -| `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 | `{}` | +| Name | Description | Value | +| ---------------------------- | --------------------------------------------------------------------------------------------------------------------- | ------------------------------------- | +| `podAnnotations` | Used to inject custom annotations directly into | `{}` | +| `replicaCount` | The number of controllers and agents 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. | `latest` | +| `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. | `true` | +| `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 empty to utilize the global network | `""` | +| `serverAddr` | This is the URL of the ngrok server to connect to. You should set this if you are using a custom ingress URL. | `""` | +| `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 | `{}` | diff --git a/helm/ingress-controller/templates/_helpers.tpl b/helm/ingress-controller/templates/_helpers.tpl index 4f28a355..e9117e72 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 "ngrok-ingress-controller.name" -}} +{{- define "kubernetes-ingress-controller.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create chart name and version as used by the chart label. */}} -{{- define "ngrok-ingress-controller.chart" -}} +{{- define "kubernetes-ingress-controller.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 "ngrok-ingress-controller.fullname" -}} +{{- define "kubernetes-ingress-controller.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 "ngrok-ingress-controller.credentialsSecretName" -}} +{{- define "kubernetes-ingress-controller.credentialsSecretName" -}} {{- if .Values.credentials.secret.name -}} {{- .Values.credentials.secret.name -}} {{- else -}} -{{- printf "%s-credentials" (include "ngrok-ingress-controller.fullname" .) -}} +{{- printf "%s-credentials" (include "kubernetes-ingress-controller.fullname" .) -}} {{- end -}} {{- end -}} {{/* Common labels */}} -{{- define "ngrok-ingress-controller.labels" -}} -helm.sh/chart: {{ include "ngrok-ingress-controller.chart" . }} -{{ include "ngrok-ingress-controller.selectorLabels" . }} +{{- define "kubernetes-ingress-controller.labels" -}} +helm.sh/chart: {{ include "kubernetes-ingress-controller.chart" . }} +{{ include "kubernetes-ingress-controller.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} -app.kubernetes.io/part-of: {{ template "ngrok-ingress-controller.name" . }} +app.kubernetes.io/part-of: {{ template "kubernetes-ingress-controller.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 "ngrok-ingress-controller.selectorLabels" -}} -app.kubernetes.io/name: {{ include "ngrok-ingress-controller.name" . }} +{{- define "kubernetes-ingress-controller.selectorLabels" -}} +app.kubernetes.io/name: {{ include "kubernetes-ingress-controller.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} {{/* Create the name of the controller service account to use */}} -{{- define "ngrok-ingress-controller.serviceAccountName" -}} +{{- define "kubernetes-ingress-controller.serviceAccountName" -}} {{- if .Values.serviceAccount.create -}} - {{ default (include "ngrok-ingress-controller.fullname" .) .Values.serviceAccount.name }} + {{ default (include "kubernetes-ingress-controller.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 "ngrok-ingress-controller.image" -}} +{{- define "kubernetes-ingress-controller.image" -}} {{- $registryName := .Values.image.registry -}} {{- $repositoryName := .Values.image.repository -}} {{- $tag := .Values.image.tag | toString -}} diff --git a/helm/ingress-controller/templates/agent-config-cm.yaml b/helm/ingress-controller/templates/agent-config-cm.yaml index 00860918..45357991 100644 --- a/helm/ingress-controller/templates/agent-config-cm.yaml +++ b/helm/ingress-controller/templates/agent-config-cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "ngrok-ingress-controller.fullname" . }}-agent-cm + name: {{ include "kubernetes-ingress-controller.fullname" . }}-agent-cm namespace: {{ .Release.Namespace }} data: METADATA: "{{ .Values.metaData }}" diff --git a/helm/ingress-controller/templates/controller-cm.yaml b/helm/ingress-controller/templates/controller-cm.yaml index 385b8ed5..88728341 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 "ngrok-ingress-controller.fullname" . }}-manager-config + name: {{ include "kubernetes-ingress-controller.fullname" . }}-manager-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 "ngrok-ingress-controller.fullname" . }}-leader + resourceName: {{ include "kubernetes-ingress-controller.fullname" . }}-leader diff --git a/helm/ingress-controller/templates/controller-deployment.yaml b/helm/ingress-controller/templates/controller-deployment.yaml index 01c59363..f6c72d59 100644 --- a/helm/ingress-controller/templates/controller-deployment.yaml +++ b/helm/ingress-controller/templates/controller-deployment.yaml @@ -2,9 +2,9 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - {{- include "ngrok-ingress-controller.labels" . | nindent 4 }} + {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} app.kubernetes.io/component: controller - name: {{ include "ngrok-ingress-controller.fullname" . }}-manager + name: {{ include "kubernetes-ingress-controller.fullname" . }}-manager namespace: {{ .Release.Namespace }} annotations: checksum/agent-config: {{ include (print $.Template.BasePath "/agent-config-cm.yaml") . | sha256sum }} @@ -14,7 +14,7 @@ spec: replicas: {{.Values.replicaCount}} selector: matchLabels: - {{- include "ngrok-ingress-controller.selectorLabels" . | nindent 6 }} + {{- include "kubernetes-ingress-controller.selectorLabels" . | nindent 6 }} app.kubernetes.io/component: controller template: metadata: @@ -27,17 +27,17 @@ spec: prometheus.io/port: '8080' prometheus.io/scrape: 'true' labels: - {{- include "ngrok-ingress-controller.selectorLabels" . | nindent 8 }} + {{- include "kubernetes-ingress-controller.selectorLabels" . | nindent 8 }} app.kubernetes.io/component: controller spec: - serviceAccountName: {{ template "ngrok-ingress-controller.serviceAccountName" . }} + serviceAccountName: {{ template "kubernetes-ingress-controller.serviceAccountName" . }} {{- if .Values.image.pullSecrets }} imagePullSecrets: {{- toYaml .Values.image.pullSecrets | nindent 8 }} {{- end }} containers: - name: ngrok-ingress-controller - image: {{ include "ngrok-ingress-controller.image" . }} + image: {{ include "kubernetes-ingress-controller.image" . }} imagePullPolicy: {{ .Values.image.pullPolicy }} command: - /manager @@ -50,7 +50,7 @@ spec: {{- end }} - --health-probe-bind-address=:8081 - --metrics-bind-address=:8080 - - --election-id={{ include "ngrok-ingress-controller.fullname" . }}-leader + - --election-id={{ include "kubernetes-ingress-controller.fullname" . }}-leader securityContext: allowPrivilegeEscalation: false env: @@ -58,12 +58,12 @@ spec: valueFrom: secretKeyRef: key: API_KEY - name: {{ include "ngrok-ingress-controller.credentialsSecretName" . }} + name: {{ include "kubernetes-ingress-controller.credentialsSecretName" . }} - name: NGROK_AUTHTOKEN valueFrom: secretKeyRef: key: AUTHTOKEN - name: {{ include "ngrok-ingress-controller.credentialsSecretName" . }} + name: {{ include "kubernetes-ingress-controller.credentialsSecretName" . }} - name: POD_NAMESPACE valueFrom: fieldRef: diff --git a/helm/ingress-controller/templates/controller-rbac.yaml b/helm/ingress-controller/templates/controller-rbac.yaml index 17503733..82fade5c 100644 --- a/helm/ingress-controller/templates/controller-rbac.yaml +++ b/helm/ingress-controller/templates/controller-rbac.yaml @@ -66,7 +66,7 @@ roleRef: name: ngrok-ingress-controller-leader-election-role subjects: - kind: ServiceAccount - name: {{ template "ngrok-ingress-controller.serviceAccountName" . }} + name: {{ template "kubernetes-ingress-controller.serviceAccountName" . }} namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 @@ -79,7 +79,7 @@ roleRef: name: ngrok-ingress-controller-manager-role subjects: - kind: ServiceAccount - name: {{ template "ngrok-ingress-controller.serviceAccountName" . }} + name: {{ template "kubernetes-ingress-controller.serviceAccountName" . }} namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 @@ -92,5 +92,5 @@ roleRef: name: ngrok-ingress-controller-proxy-role subjects: - kind: ServiceAccount - name: {{ template "ngrok-ingress-controller.serviceAccountName" . }} + name: {{ template "kubernetes-ingress-controller.serviceAccountName" . }} namespace: {{ .Release.Namespace }} diff --git a/helm/ingress-controller/templates/controller-serviceaccount.yaml b/helm/ingress-controller/templates/controller-serviceaccount.yaml index efc1e395..d80a5d8c 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 "ngrok-ingress-controller.serviceAccountName" . }} + name: {{ template "kubernetes-ingress-controller.serviceAccountName" . }} namespace: {{ .Release.Namespace }} labels: - {{- include "ngrok-ingress-controller.labels" . | nindent 4 }} + {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} app.kubernetes.io/component: controller {{- if .Values.serviceAccount.annotations }} annotations: diff --git a/helm/ingress-controller/templates/credentials-secret.yaml b/helm/ingress-controller/templates/credentials-secret.yaml index 4ec26c06..e6e1a92a 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 "ngrok-ingress-controller.credentialsSecretName" .}} + name: {{ include "kubernetes-ingress-controller.credentialsSecretName" .}} type: Opaque data: API_KEY: {{ required "An ngrok API key is required" .Values.credentials.apiKey | b64enc }} diff --git a/helm/ingress-controller/templates/ingress-class.yaml b/helm/ingress-controller/templates/ingress-class.yaml index e202c516..89da2e36 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 "ngrok-ingress-controller.labels" . | nindent 4 }} + {{- include "kubernetes-ingress-controller.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 e7974e90..88e527a3 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 "ngrok-ingress-controller.labels" . | nindent 4 }} + {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} app.kubernetes.io/component: rbac - name: {{ include "ngrok-ingress-controller.fullname" . }}-domain-editor-role + name: {{ include "kubernetes-ingress-controller.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 5256b4b3..bf5f5196 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 "ngrok-ingress-controller.labels" . | nindent 4 }} + {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} app.kubernetes.io/component: rbac - name: {{ include "ngrok-ingress-controller.fullname" . }}-domain-viewer-role + name: {{ include "kubernetes-ingress-controller.fullname" . }}-domain-viewer-role rules: - apiGroups: - ingress.k8s.ngrok.com diff --git a/helm/ingress-controller/templates/rbac/tunnel_editor_role.yaml b/helm/ingress-controller/templates/rbac/tunnel_editor_role.yaml index da835def..ab727516 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 "ngrok-ingress-controller.labels" . | nindent 4 }} + {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} app.kubernetes.io/component: rbac - name: {{ include "ngrok-ingress-controller.fullname" . }}-tunnel-editor-role + name: {{ include "kubernetes-ingress-controller.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 0343f100..dfdb4b6f 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 "ngrok-ingress-controller.labels" . | nindent 4 }} + {{- include "kubernetes-ingress-controller.labels" . | nindent 4 }} app.kubernetes.io/component: rbac - name: {{ include "ngrok-ingress-controller.fullname" . }}-tunnel-viewer-role + name: {{ include "kubernetes-ingress-controller.fullname" . }}-tunnel-viewer-role rules: - apiGroups: - ingress.k8s.ngrok.com diff --git a/helm/ingress-controller/tests/__snapshot__/agent-config-cm_test.yaml.snap b/helm/ingress-controller/tests/__snapshot__/agent-config-cm_test.yaml.snap index 609963ac..341fb9a4 100644 --- a/helm/ingress-controller/tests/__snapshot__/agent-config-cm_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/agent-config-cm_test.yaml.snap @@ -7,5 +7,5 @@ Should match snapshot: REMOTE_MANAGEMENT: "" kind: ConfigMap metadata: - name: RELEASE-NAME-ngrok-ingress-controller-agent-cm + name: RELEASE-NAME-kubernetes-ingress-controller-agent-cm namespace: NAMESPACE 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 b87adbfa..e55b1ddc 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-ngrok-ingress-controller-leader + resourceName: test-release-kubernetes-ingress-controller-leader kind: ConfigMap metadata: - name: test-release-ngrok-ingress-controller-manager-config + name: test-release-kubernetes-ingress-controller-manager-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 5adbb6a5..a2c644b3 100644 --- a/helm/ingress-controller/tests/__snapshot__/controller-deployment_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/controller-deployment_test.yaml.snap @@ -4,18 +4,18 @@ Should match all-options snapshot: kind: Deployment metadata: annotations: - checksum/agent-config: 3671fa6e906913b7e88c956cd85864fb4a056335e2676f8fce44a1cfafba37d6 + checksum/agent-config: 3b489411f7beac52b84c9645f888cd57f483193fded2b336a5737c9a59760e51 checksum/controller-role: 78f53a459d02fa3696fbc4c74b0c84b3bb8d23fa0500b544ada31209bc908fd8 - checksum/rbac: d65fd1d397f0da2dc2888c7af42265b5a47272fbbf56a0c3331023d949f3c58b + checksum/rbac: d31fdcb337a6f1ee71323040c2cbc4d5580d73ae5f7623cd19be57db97f748c1 labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller - app.kubernetes.io/version: 0.2.0 - helm.sh/chart: ngrok-ingress-controller-0.4.0 - name: RELEASE-NAME-ngrok-ingress-controller-manager + app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/version: 0.3.0 + helm.sh/chart: kubernetes-ingress-controller-0.5.0 + name: RELEASE-NAME-kubernetes-ingress-controller-manager namespace: NAMESPACE spec: replicas: 1 @@ -23,7 +23,7 @@ Should match all-options snapshot: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME - app.kubernetes.io/name: ngrok-ingress-controller + app.kubernetes.io/name: kubernetes-ingress-controller template: metadata: annotations: @@ -34,13 +34,13 @@ Should match all-options snapshot: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME - app.kubernetes.io/name: ngrok-ingress-controller + app.kubernetes.io/name: kubernetes-ingress-controller spec: containers: - args: - --health-probe-bind-address=:8081 - --metrics-bind-address=:8080 - - --election-id=RELEASE-NAME-ngrok-ingress-controller-leader + - --election-id=RELEASE-NAME-kubernetes-ingress-controller-leader command: - /manager env: @@ -48,12 +48,12 @@ Should match all-options snapshot: valueFrom: secretKeyRef: key: API_KEY - name: RELEASE-NAME-ngrok-ingress-controller-credentials + name: RELEASE-NAME-kubernetes-ingress-controller-credentials - name: NGROK_AUTHTOKEN valueFrom: secretKeyRef: key: AUTHTOKEN - name: RELEASE-NAME-ngrok-ingress-controller-credentials + name: RELEASE-NAME-kubernetes-ingress-controller-credentials - name: POD_NAMESPACE valueFrom: fieldRef: @@ -65,7 +65,7 @@ Should match all-options snapshot: value: test-value - name: TEST_ENV_VAR value: test - image: docker.io/ngrok/ngrok-ingress-controller:latest + image: docker.io/ngrok/kubernetes-ingress-controller:latest imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -88,7 +88,7 @@ Should match all-options snapshot: volumeMounts: - mountPath: /test-volume name: test-volume - serviceAccountName: RELEASE-NAME-ngrok-ingress-controller + serviceAccountName: RELEASE-NAME-kubernetes-ingress-controller volumes: - emptyDir: {} name: test-volume @@ -100,7 +100,7 @@ Should match all-options snapshot: REMOTE_MANAGEMENT: "" kind: ConfigMap metadata: - name: RELEASE-NAME-ngrok-ingress-controller-agent-cm + name: RELEASE-NAME-kubernetes-ingress-controller-agent-cm namespace: NAMESPACE 3: | apiVersion: rbac.authorization.k8s.io/v1 @@ -170,7 +170,7 @@ Should match all-options snapshot: name: ngrok-ingress-controller-leader-election-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-ngrok-ingress-controller + name: RELEASE-NAME-kubernetes-ingress-controller namespace: NAMESPACE 6: | apiVersion: rbac.authorization.k8s.io/v1 @@ -183,7 +183,7 @@ Should match all-options snapshot: name: ngrok-ingress-controller-manager-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-ngrok-ingress-controller + name: RELEASE-NAME-kubernetes-ingress-controller namespace: NAMESPACE 7: | apiVersion: rbac.authorization.k8s.io/v1 @@ -196,7 +196,7 @@ Should match all-options snapshot: name: ngrok-ingress-controller-proxy-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-ngrok-ingress-controller + name: RELEASE-NAME-kubernetes-ingress-controller namespace: NAMESPACE 8: | apiVersion: rbac.authorization.k8s.io/v1 @@ -367,18 +367,18 @@ Should match default snapshot: kind: Deployment metadata: annotations: - checksum/agent-config: 3671fa6e906913b7e88c956cd85864fb4a056335e2676f8fce44a1cfafba37d6 + checksum/agent-config: 3b489411f7beac52b84c9645f888cd57f483193fded2b336a5737c9a59760e51 checksum/controller-role: 78f53a459d02fa3696fbc4c74b0c84b3bb8d23fa0500b544ada31209bc908fd8 - checksum/rbac: d65fd1d397f0da2dc2888c7af42265b5a47272fbbf56a0c3331023d949f3c58b + checksum/rbac: d31fdcb337a6f1ee71323040c2cbc4d5580d73ae5f7623cd19be57db97f748c1 labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller - app.kubernetes.io/version: 0.2.0 - helm.sh/chart: ngrok-ingress-controller-0.4.0 - name: RELEASE-NAME-ngrok-ingress-controller-manager + app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/version: 0.3.0 + helm.sh/chart: kubernetes-ingress-controller-0.5.0 + name: RELEASE-NAME-kubernetes-ingress-controller-manager namespace: NAMESPACE spec: replicas: 1 @@ -386,7 +386,7 @@ Should match default snapshot: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME - app.kubernetes.io/name: ngrok-ingress-controller + app.kubernetes.io/name: kubernetes-ingress-controller template: metadata: annotations: @@ -397,13 +397,13 @@ Should match default snapshot: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: RELEASE-NAME - app.kubernetes.io/name: ngrok-ingress-controller + app.kubernetes.io/name: kubernetes-ingress-controller spec: containers: - args: - --health-probe-bind-address=:8081 - --metrics-bind-address=:8080 - - --election-id=RELEASE-NAME-ngrok-ingress-controller-leader + - --election-id=RELEASE-NAME-kubernetes-ingress-controller-leader command: - /manager env: @@ -411,17 +411,17 @@ Should match default snapshot: valueFrom: secretKeyRef: key: API_KEY - name: RELEASE-NAME-ngrok-ingress-controller-credentials + name: RELEASE-NAME-kubernetes-ingress-controller-credentials - name: NGROK_AUTHTOKEN valueFrom: secretKeyRef: key: AUTHTOKEN - name: RELEASE-NAME-ngrok-ingress-controller-credentials + name: RELEASE-NAME-kubernetes-ingress-controller-credentials - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace - image: docker.io/ngrok/ngrok-ingress-controller:latest + image: docker.io/ngrok/kubernetes-ingress-controller:latest imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -441,7 +441,7 @@ Should match default snapshot: requests: {} securityContext: allowPrivilegeEscalation: false - serviceAccountName: RELEASE-NAME-ngrok-ingress-controller + serviceAccountName: RELEASE-NAME-kubernetes-ingress-controller 2: | apiVersion: v1 data: @@ -450,7 +450,7 @@ Should match default snapshot: REMOTE_MANAGEMENT: "" kind: ConfigMap metadata: - name: RELEASE-NAME-ngrok-ingress-controller-agent-cm + name: RELEASE-NAME-kubernetes-ingress-controller-agent-cm namespace: NAMESPACE 3: | apiVersion: rbac.authorization.k8s.io/v1 @@ -520,7 +520,7 @@ Should match default snapshot: name: ngrok-ingress-controller-leader-election-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-ngrok-ingress-controller + name: RELEASE-NAME-kubernetes-ingress-controller namespace: NAMESPACE 6: | apiVersion: rbac.authorization.k8s.io/v1 @@ -533,7 +533,7 @@ Should match default snapshot: name: ngrok-ingress-controller-manager-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-ngrok-ingress-controller + name: RELEASE-NAME-kubernetes-ingress-controller namespace: NAMESPACE 7: | apiVersion: rbac.authorization.k8s.io/v1 @@ -546,7 +546,7 @@ Should match default snapshot: name: ngrok-ingress-controller-proxy-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-ngrok-ingress-controller + name: RELEASE-NAME-kubernetes-ingress-controller namespace: NAMESPACE 8: | apiVersion: rbac.authorization.k8s.io/v1 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 d10ecfc2..ecba0815 100644 --- a/helm/ingress-controller/tests/__snapshot__/controller-rbac_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/controller-rbac_test.yaml.snap @@ -67,7 +67,7 @@ Should match snapshot: name: ngrok-ingress-controller-leader-election-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-ngrok-ingress-controller + name: RELEASE-NAME-kubernetes-ingress-controller namespace: NAMESPACE 4: | apiVersion: rbac.authorization.k8s.io/v1 @@ -80,7 +80,7 @@ Should match snapshot: name: ngrok-ingress-controller-manager-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-ngrok-ingress-controller + name: RELEASE-NAME-kubernetes-ingress-controller namespace: NAMESPACE 5: | apiVersion: rbac.authorization.k8s.io/v1 @@ -93,5 +93,5 @@ Should match snapshot: name: ngrok-ingress-controller-proxy-role subjects: - kind: ServiceAccount - name: RELEASE-NAME-ngrok-ingress-controller + name: RELEASE-NAME-kubernetes-ingress-controller 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 857d934e..10a3e8f6 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: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller - app.kubernetes.io/version: 0.2.0 - helm.sh/chart: ngrok-ingress-controller-0.4.0 - name: test-release-ngrok-ingress-controller + app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/version: 0.3.0 + helm.sh/chart: kubernetes-ingress-controller-0.5.0 + name: test-release-kubernetes-ingress-controller 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 f9484e47..e6ef425c 100644 --- a/helm/ingress-controller/tests/__snapshot__/credentials-secret_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/credentials-secret_test.yaml.snap @@ -6,5 +6,5 @@ Should match snapshot: AUTHTOKEN: dGVzdC1hdXRodG9rZW4= kind: Secret metadata: - name: RELEASE-NAME-ngrok-ingress-controller-credentials + name: RELEASE-NAME-kubernetes-ingress-controller-credentials 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 100f5886..5d3b480a 100644 --- a/helm/ingress-controller/tests/__snapshot__/ingress-class_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/ingress-class_test.yaml.snap @@ -9,10 +9,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: ngrok-ingress-controller - app.kubernetes.io/part-of: ngrok-ingress-controller - app.kubernetes.io/version: 0.2.0 - helm.sh/chart: ngrok-ingress-controller-0.4.0 + app.kubernetes.io/name: kubernetes-ingress-controller + app.kubernetes.io/part-of: kubernetes-ingress-controller + app.kubernetes.io/version: 0.3.0 + helm.sh/chart: kubernetes-ingress-controller-0.5.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 67c08852..be83fd98 100644 --- a/helm/ingress-controller/tests/controller-cm_test.yaml +++ b/helm/ingress-controller/tests/controller-cm_test.yaml @@ -27,7 +27,7 @@ tests: asserts: - equal: path: metadata.name - value: test-release-ngrok-ingress-controller-manager-config + value: test-release-kubernetes-ingress-controller-manager-config - it: Works when fullname is supplied set: fullnameOverride: fno diff --git a/helm/ingress-controller/values.yaml b/helm/ingress-controller/values.yaml index 083bfd6a..dd7a33a1 100644 --- a/helm/ingress-controller/values.yaml +++ b/helm/ingress-controller/values.yaml @@ -31,7 +31,7 @@ replicaCount: 1 ## @param image.pullSecrets An array of imagePullSecrets to be used when pulling the image. image: registry: docker.io - repository: ngrok/ngrok-ingress-controller + repository: ngrok/kubernetes-ingress-controller tag: latest pullPolicy: IfNotPresent ## Example diff --git a/internal/annotations/annotations.go b/internal/annotations/annotations.go index 45a42819..5f3e1f60 100644 --- a/internal/annotations/annotations.go +++ b/internal/annotations/annotations.go @@ -18,10 +18,10 @@ package annotations import ( "github.com/imdario/mergo" - ingressv1alpha1 "github.com/ngrok/ngrok-ingress-controller/api/v1alpha1" - "github.com/ngrok/ngrok-ingress-controller/internal/annotations/compression" - "github.com/ngrok/ngrok-ingress-controller/internal/annotations/parser" - "github.com/ngrok/ngrok-ingress-controller/internal/errors" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/compression" + "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" + "github.com/ngrok/kubernetes-ingress-controller/internal/errors" networking "k8s.io/api/networking/v1" "k8s.io/klog/v2" ) diff --git a/internal/annotations/compression/compression.go b/internal/annotations/compression/compression.go index ed762b0a..aac4d882 100644 --- a/internal/annotations/compression/compression.go +++ b/internal/annotations/compression/compression.go @@ -1,8 +1,8 @@ package compression import ( - ingressv1alpha1 "github.com/ngrok/ngrok-ingress-controller/api/v1alpha1" - "github.com/ngrok/ngrok-ingress-controller/internal/annotations/parser" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" networking "k8s.io/api/networking/v1" "k8s.io/utils/pointer" ) diff --git a/internal/annotations/parser/parser.go b/internal/annotations/parser/parser.go index f964fc52..79a8ca21 100644 --- a/internal/annotations/parser/parser.go +++ b/internal/annotations/parser/parser.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/ngrok/ngrok-ingress-controller/internal/errors" + "github.com/ngrok/kubernetes-ingress-controller/internal/errors" networking "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/internal/controllers/domain_controller.go b/internal/controllers/domain_controller.go index f0aacbcf..d1267e86 100644 --- a/internal/controllers/domain_controller.go +++ b/internal/controllers/domain_controller.go @@ -35,9 +35,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/go-logr/logr" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" "github.com/ngrok/ngrok-api-go/v5" "github.com/ngrok/ngrok-api-go/v5/reserved_domains" - ingressv1alpha1 "github.com/ngrok/ngrok-ingress-controller/api/v1alpha1" ) // DomainReconciler reconciles a Domain object diff --git a/internal/controllers/httpsedge_controller.go b/internal/controllers/httpsedge_controller.go index 5bb6dcf0..b27900f7 100644 --- a/internal/controllers/httpsedge_controller.go +++ b/internal/controllers/httpsedge_controller.go @@ -36,11 +36,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/go-logr/logr" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" "github.com/ngrok/ngrok-api-go/v5" "github.com/ngrok/ngrok-api-go/v5/backends/tunnel_group" httpsedge "github.com/ngrok/ngrok-api-go/v5/edges/https" httpsedgeroutes "github.com/ngrok/ngrok-api-go/v5/edges/https_routes" - ingressv1alpha1 "github.com/ngrok/ngrok-ingress-controller/api/v1alpha1" ) // HTTPSEdgeReconciler reconciles a HTTPSEdge object diff --git a/internal/controllers/ingress_controller.go b/internal/controllers/ingress_controller.go index a64f6c84..65e7f967 100644 --- a/internal/controllers/ingress_controller.go +++ b/internal/controllers/ingress_controller.go @@ -8,9 +8,9 @@ import ( "time" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/ngrok-ingress-controller/api/v1alpha1" - "github.com/ngrok/ngrok-ingress-controller/internal/annotations" - internalerrors "github.com/ngrok/ngrok-ingress-controller/internal/errors" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + "github.com/ngrok/kubernetes-ingress-controller/internal/annotations" + internalerrors "github.com/ngrok/kubernetes-ingress-controller/internal/errors" v1 "k8s.io/api/core/v1" netv1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/internal/controllers/ingress_controller_test.go b/internal/controllers/ingress_controller_test.go index fcb25ac1..c5b1c5c7 100644 --- a/internal/controllers/ingress_controller_test.go +++ b/internal/controllers/ingress_controller_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - ingressv1alpha1 "github.com/ngrok/ngrok-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" "github.com/stretchr/testify/assert" netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controllers/tcpedge_controller.go b/internal/controllers/tcpedge_controller.go index 02824419..c5ecc8cd 100644 --- a/internal/controllers/tcpedge_controller.go +++ b/internal/controllers/tcpedge_controller.go @@ -37,10 +37,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/go-logr/logr" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" "github.com/ngrok/ngrok-api-go/v5" "github.com/ngrok/ngrok-api-go/v5/backends/tunnel_group" "github.com/ngrok/ngrok-api-go/v5/edges/tcp" - ingressv1alpha1 "github.com/ngrok/ngrok-ingress-controller/api/v1alpha1" ) // TCPEdgeReconciler reconciles a TCPEdge object diff --git a/internal/controllers/tunnel_controller.go b/internal/controllers/tunnel_controller.go index 2bc67d46..bb120b6d 100644 --- a/internal/controllers/tunnel_controller.go +++ b/internal/controllers/tunnel_controller.go @@ -29,8 +29,8 @@ import ( "fmt" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/ngrok-ingress-controller/api/v1alpha1" - "github.com/ngrok/ngrok-ingress-controller/pkg/tunneldriver" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + "github.com/ngrok/kubernetes-ingress-controller/pkg/tunneldriver" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" diff --git a/main.go b/main.go index f2bf05d1..5ef67dea 100644 --- a/main.go +++ b/main.go @@ -40,11 +40,11 @@ import ( "github.com/ngrok/ngrok-api-go/v5" - ingressv1alpha1 "github.com/ngrok/ngrok-ingress-controller/api/v1alpha1" - "github.com/ngrok/ngrok-ingress-controller/internal/annotations" - "github.com/ngrok/ngrok-ingress-controller/internal/controllers" - "github.com/ngrok/ngrok-ingress-controller/internal/ngrokapi" - "github.com/ngrok/ngrok-ingress-controller/pkg/tunneldriver" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + "github.com/ngrok/kubernetes-ingress-controller/internal/annotations" + "github.com/ngrok/kubernetes-ingress-controller/internal/controllers" + "github.com/ngrok/kubernetes-ingress-controller/internal/ngrokapi" + "github.com/ngrok/kubernetes-ingress-controller/pkg/tunneldriver" //+kubebuilder:scaffold:imports )