From c1e192aa94a168bd997ea662b1e9cc5abc3cd94a Mon Sep 17 00:00:00 2001 From: Nikolay Petrov Date: Fri, 8 Sep 2023 12:23:53 -0400 Subject: [PATCH 1/2] update helm chart version and use the new controller version --- CHANGELOG.md | 2 +- helm/ingress-controller/CHANGELOG.md | 14 +++++++++++++- helm/ingress-controller/Chart.yaml | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aabc7be..203bccce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Update ngrok-go to 1.4.0 [#298](https://github.com/ngrok/kubernetes-ingress-controller/pull/298) - Tunnels are now unique in their respective namespace, not across the cluster [#281](https://github.com/ngrok/kubernetes-ingress-controller/pull/281) -- The CRs that ingess controller creates are uniquely marked and managed by it. Other CRs created manually are no longer deleted when the ingess controller is not using them [#267](https://github.com/ngrok/kubernetes-ingress-controller/issues/267); fixed for tunnel in [#285](https://github.com/ngrok/kubernetes-ingress-controller/pull/285) and for https edges in [#286](https://github.com/ngrok/kubernetes-ingress-controller/pull/286) +- The CRs that ingress controller creates are uniquely marked and managed by it. Other CRs created manually are no longer deleted when the ingress controller is not using them [#267](https://github.com/ngrok/kubernetes-ingress-controller/issues/267); fixed for tunnel in [#285](https://github.com/ngrok/kubernetes-ingress-controller/pull/285) and for https edges in [#286](https://github.com/ngrok/kubernetes-ingress-controller/pull/286) - Better error handling and retry, specifically for the case where we try to create an https edge for a domain which is not created yet [#283](https://github.com/ngrok/kubernetes-ingress-controller/issues/283); fixed in [#288](https://github.com/ngrok/kubernetes-ingress-controller/pull/288) - Watch and apply ngrok module set CR changes [#287](https://github.com/ngrok/kubernetes-ingress-controller/issues/287); fixed in [#290](https://github.com/ngrok/kubernetes-ingress-controller/pull/290) - Label https edges and tunnels with service UID to make them more unique within ngrok [#291](https://github.com/ngrok/kubernetes-ingress-controller/issues/291); fixed in [#293](https://github.com/ngrok/kubernetes-ingress-controller/pull/293) and [#302](https://github.com/ngrok/kubernetes-ingress-controller/pull/302) diff --git a/helm/ingress-controller/CHANGELOG.md b/helm/ingress-controller/CHANGELOG.md index 6f8d755f..bf8934b5 100644 --- a/helm/ingress-controller/CHANGELOG.md +++ b/helm/ingress-controller/CHANGELOG.md @@ -5,13 +5,25 @@ 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). -## [Unreleased] +## 0.11.0 + +** Important ** This version of the controller changes the ownership model for https edge and tunnel CRs. To ease out the transition to the new ownership, make sure to run `migrate-edges.sh` and `migrate-tunnels.sh` scripts before installing the new version. ### Changed - Specify IPPolicyRule action as an enum of (allow,deny) as part of [#260](https://github.com/ngrok/kubernetes-ingress-controller/pull/260) +- Handle special case for changing auth types that causes an error during state transition [#259](https://github.com/ngrok/kubernetes-ingress-controller/pull/259) +- Better handling when changing pathType between 'Exact' and 'Prefix' [#262](https://github.com/ngrok/kubernetes-ingress-controller/pull/262) +- Update ngrok-go to 1.4.0 [#298](https://github.com/ngrok/kubernetes-ingress-controller/pull/298) +- Tunnels are now unique in their respective namespace, not across the cluster [#281](https://github.com/ngrok/kubernetes-ingress-controller/pull/281) +- The CRs that ingress controller creates are uniquely marked and managed by it. Other CRs created manually are no longer deleted when the ingress controller is not using them [#267](https://github.com/ngrok/kubernetes-ingress-controller/issues/267); fixed for tunnel in [#285](https://github.com/ngrok/kubernetes-ingress-controller/pull/285) and for https edges in [#286](https://github.com/ngrok/kubernetes-ingress-controller/pull/286) +- Better error handling and retry, specifically for the case where we try to create an https edge for a domain which is not created yet [#283](https://github.com/ngrok/kubernetes-ingress-controller/issues/283); fixed in [#288](https://github.com/ngrok/kubernetes-ingress-controller/pull/288) +- Watch and apply ngrok module set CR changes [#287](https://github.com/ngrok/kubernetes-ingress-controller/issues/287); fixed in [#290](https://github.com/ngrok/kubernetes-ingress-controller/pull/290) +- Label https edges and tunnels with service UID to make them more unique within ngrok [#291](https://github.com/ngrok/kubernetes-ingress-controller/issues/291); fixed in [#293](https://github.com/ngrok/kubernetes-ingress-controller/pull/293) and [#302](https://github.com/ngrok/kubernetes-ingress-controller/pull/302) ### Added - Add support for configuring pod affinities, pod disruption budget, and priorityClassName [#258](https://github.com/ngrok/kubernetes-ingress-controller/pull/258) +- The controller stopping at the first resource create [#270](https://github.com/ngrok/kubernetes-ingress-controller/pull/270) +- Using `make deploy` now requires `NGROK_AUTHTOKEN` and `NGROK_API_KEY` to be set [#292](https://github.com/ngrok/kubernetes-ingress-controller/pull/292) ## 0.10.0 diff --git a/helm/ingress-controller/Chart.yaml b/helm/ingress-controller/Chart.yaml index 218029ff..630eeee3 100644 --- a/helm/ingress-controller/Chart.yaml +++ b/helm/ingress-controller/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: kubernetes-ingress-controller description: A Kubernetes ingress controller built using ngrok. -version: 0.11.0-rc.1 -appVersion: 0.8.0 +version: 0.11.0 +appVersion: 0.9.0 keywords: - ngrok - networking From 0085f9df64ef3977d61f1e036327c7f20abad101 Mon Sep 17 00:00:00 2001 From: Nikolay Petrov Date: Fri, 8 Sep 2023 12:48:19 -0400 Subject: [PATCH 2/2] update manifests --- helm/ingress-controller/Chart.lock | 6 +++--- .../controller-deployment_test.yaml.snap | 12 ++++++------ .../tests/__snapshot__/controller-pdb_test.yaml.snap | 4 ++-- .../controller-serviceaccount_test.yaml.snap | 4 ++-- .../tests/__snapshot__/ingress-class_test.yaml.snap | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/helm/ingress-controller/Chart.lock b/helm/ingress-controller/Chart.lock index f3fe7d5c..eeddc5e1 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.10.0 -digest: sha256:dde2dd8a6a067dc19ae9ea30781c145654a2f8663664497c60b7deec6825f440 -generated: "2023-09-07T11:46:40.831614-04:00" + version: 2.10.1 +digest: sha256:54cb57fbf004b3cf03fe382619b87c9d17469340f3d24f506a2dbec185a9455a +generated: "2023-09-08T12:48:02.907551-04:00" 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 03993859..4ea3b4e3 100644 --- a/helm/ingress-controller/tests/__snapshot__/controller-deployment_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/controller-deployment_test.yaml.snap @@ -12,8 +12,8 @@ Should match all-options snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubernetes-ingress-controller app.kubernetes.io/part-of: kubernetes-ingress-controller - app.kubernetes.io/version: 0.8.0 - helm.sh/chart: kubernetes-ingress-controller-0.11.0-rc.1 + app.kubernetes.io/version: 0.9.0 + helm.sh/chart: kubernetes-ingress-controller-0.11.0 name: RELEASE-NAME-kubernetes-ingress-controller-manager namespace: NAMESPACE spec: @@ -81,7 +81,7 @@ Should match all-options snapshot: value: test-value - name: TEST_ENV_VAR value: test - image: docker.io/ngrok/kubernetes-ingress-controller:0.8.0 + image: docker.io/ngrok/kubernetes-ingress-controller:0.9.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -423,8 +423,8 @@ Should match default snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubernetes-ingress-controller app.kubernetes.io/part-of: kubernetes-ingress-controller - app.kubernetes.io/version: 0.8.0 - helm.sh/chart: kubernetes-ingress-controller-0.11.0-rc.1 + app.kubernetes.io/version: 0.9.0 + helm.sh/chart: kubernetes-ingress-controller-0.11.0 name: RELEASE-NAME-kubernetes-ingress-controller-manager namespace: NAMESPACE spec: @@ -485,7 +485,7 @@ Should match default snapshot: valueFrom: fieldRef: fieldPath: metadata.namespace - image: docker.io/ngrok/kubernetes-ingress-controller:0.8.0 + image: docker.io/ngrok/kubernetes-ingress-controller:0.9.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: 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 13d7f905..e39cb267 100644 --- a/helm/ingress-controller/tests/__snapshot__/controller-pdb_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/controller-pdb_test.yaml.snap @@ -9,8 +9,8 @@ should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubernetes-ingress-controller app.kubernetes.io/part-of: kubernetes-ingress-controller - app.kubernetes.io/version: 0.8.0 - helm.sh/chart: kubernetes-ingress-controller-0.11.0-rc.1 + app.kubernetes.io/version: 0.9.0 + helm.sh/chart: kubernetes-ingress-controller-0.11.0 name: test-release-kubernetes-ingress-controller-controller-pdb namespace: test-namespace spec: 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 875fda96..d24e0d6f 100644 --- a/helm/ingress-controller/tests/__snapshot__/controller-serviceaccount_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/controller-serviceaccount_test.yaml.snap @@ -9,7 +9,7 @@ Should match the snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubernetes-ingress-controller app.kubernetes.io/part-of: kubernetes-ingress-controller - app.kubernetes.io/version: 0.8.0 - helm.sh/chart: kubernetes-ingress-controller-0.11.0-rc.1 + app.kubernetes.io/version: 0.9.0 + helm.sh/chart: kubernetes-ingress-controller-0.11.0 name: test-release-kubernetes-ingress-controller namespace: test-namespace 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 4d9bf678..44718bed 100644 --- a/helm/ingress-controller/tests/__snapshot__/ingress-class_test.yaml.snap +++ b/helm/ingress-controller/tests/__snapshot__/ingress-class_test.yaml.snap @@ -9,8 +9,8 @@ Should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubernetes-ingress-controller app.kubernetes.io/part-of: kubernetes-ingress-controller - app.kubernetes.io/version: 0.8.0 - helm.sh/chart: kubernetes-ingress-controller-0.11.0-rc.1 + app.kubernetes.io/version: 0.9.0 + helm.sh/chart: kubernetes-ingress-controller-0.11.0 name: ngrok spec: controller: k8s.ngrok.com/ingress-controller