From 4e640df67c7d8b70d9ba945c4a971eda3917e4aa Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Wed, 9 Feb 2022 15:03:12 -0600 Subject: [PATCH 1/4] Add ingressClassName option to ingress --- ci/helm-chart/templates/ingress.yaml | 3 +++ ci/helm-chart/values.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/helm-chart/templates/ingress.yaml b/ci/helm-chart/templates/ingress.yaml index d0a552cdfd99..1da432074b29 100644 --- a/ci/helm-chart/templates/ingress.yaml +++ b/ci/helm-chart/templates/ingress.yaml @@ -18,6 +18,9 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + {{- if .Values.ingress.ingressClassName }} + ingressClassName: {{ .Values.ingress.ingressClassName }} + {{- end }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 9dfc948138f9..906712640a36 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -41,7 +41,7 @@ ingress: # - host: code-server.example.loc # paths: # - / - + #ingressClassName: nginx #tls: # - secretName: code-server # hosts: From f7cbe0d5f16d592749d839fa4b0e44dc544522ed Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Wed, 9 Feb 2022 15:12:32 -0600 Subject: [PATCH 2/4] Bump chart version by minor release --- ci/helm-chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 233e71c58b49..c68fb2b20c4e 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.0.1 +version: 2.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From bd28bc461b126a6e823d3ded3f52b80a9502a2d8 Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Thu, 10 Feb 2022 16:31:54 -0600 Subject: [PATCH 3/4] PR Feedback Updates --- ci/helm-chart/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 906712640a36..7127cfddc832 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -35,13 +35,12 @@ service: ingress: enabled: false #annotations: - # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" #hosts: # - host: code-server.example.loc # paths: # - / - #ingressClassName: nginx + ingressClassName: #tls: # - secretName: code-server # hosts: From 25bdb99a6b6c436e4eb087e9d3f3ed7be07ab843 Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Thu, 10 Feb 2022 16:36:10 -0600 Subject: [PATCH 4/4] Update ci/helm-chart/values.yaml Co-authored-by: Jonathan Yu --- ci/helm-chart/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 7127cfddc832..19c6a5eaef49 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -40,7 +40,7 @@ ingress: # - host: code-server.example.loc # paths: # - / - ingressClassName: + ingressClassName: "" #tls: # - secretName: code-server # hosts: