From 5abf8b3bd2a4b07a62c4c1685c292c74c1363e06 Mon Sep 17 00:00:00 2001 From: Lucas Koehler Date: Thu, 27 Jul 2023 17:01:07 +0200 Subject: [PATCH] #31: Replace deprecated ingress class annotations with ingressClassName Contributed on behalf of STMicroelectronics Signed-off-by: Lucas Koehler --- charts/theia.cloud/Chart.yaml | 2 +- charts/theia.cloud/templates/instances-ingress-path-based.yaml | 2 +- charts/theia.cloud/templates/instances-ingress.yaml | 2 +- .../theia.cloud/templates/landing-page-ingress-path-based.yaml | 2 +- charts/theia.cloud/templates/landing-page-ingress.yaml | 2 +- charts/theia.cloud/templates/service-ingress-path-based.yaml | 2 +- charts/theia.cloud/templates/service-ingress.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/theia.cloud/Chart.yaml b/charts/theia.cloud/Chart.yaml index b459f04..44f133b 100644 --- a/charts/theia.cloud/Chart.yaml +++ b/charts/theia.cloud/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: 0.8.1-v001 +version: 0.8.1-v002 # 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 diff --git a/charts/theia.cloud/templates/instances-ingress-path-based.yaml b/charts/theia.cloud/templates/instances-ingress-path-based.yaml index 1d917a4..1038415 100644 --- a/charts/theia.cloud/templates/instances-ingress-path-based.yaml +++ b/charts/theia.cloud/templates/instances-ingress-path-based.yaml @@ -5,7 +5,6 @@ metadata: name: {{ tpl (.Values.ingress.instanceName | toString) . }} namespace: {{ .Release.Namespace }} annotations: - kubernetes.io/ingress.class: nginx {{- if not .Values.hosts.tls }} nginx.ingress.kubernetes.io/ssl-redirect: "false" {{- end }} @@ -15,6 +14,7 @@ metadata: proxy_set_header 'X-Forwarded-Uri' $request_uri; nginx.ingress.kubernetes.io/proxy-body-size: {{ tpl (.Values.ingress.proxyBodySize | toString) . }} spec: + ingressClassName: nginx {{- if .Values.hosts.tls }} tls: - hosts: diff --git a/charts/theia.cloud/templates/instances-ingress.yaml b/charts/theia.cloud/templates/instances-ingress.yaml index 9f9312e..b4744bf 100644 --- a/charts/theia.cloud/templates/instances-ingress.yaml +++ b/charts/theia.cloud/templates/instances-ingress.yaml @@ -5,7 +5,6 @@ metadata: name: {{ tpl (.Values.ingress.instanceName | toString) . }} namespace: {{ .Release.Namespace }} annotations: - kubernetes.io/ingress.class: nginx {{- if not .Values.hosts.tls }} nginx.ingress.kubernetes.io/ssl-redirect: "false" {{- end }} @@ -20,6 +19,7 @@ metadata: proxy_set_header 'X-Forwarded-Uri' $request_uri; nginx.ingress.kubernetes.io/proxy-body-size: {{ tpl (.Values.ingress.proxyBodySize | toString) . }} spec: + ingressClassName: nginx {{- if .Values.hosts.tls }} tls: - hosts: diff --git a/charts/theia.cloud/templates/landing-page-ingress-path-based.yaml b/charts/theia.cloud/templates/landing-page-ingress-path-based.yaml index a370a3b..0443409 100644 --- a/charts/theia.cloud/templates/landing-page-ingress-path-based.yaml +++ b/charts/theia.cloud/templates/landing-page-ingress-path-based.yaml @@ -4,7 +4,6 @@ kind: Ingress metadata: name: landing-page-ingress annotations: - kubernetes.io/ingress.class: nginx {{- if not .Values.hosts.tls }} nginx.ingress.kubernetes.io/ssl-redirect: "false" {{- end }} @@ -17,6 +16,7 @@ metadata: rewrite ^([^.?]*[^/])$ $1/ redirect; namespace: {{ .Release.Namespace }} spec: + ingressClassName: nginx {{- if .Values.hosts.tls }} tls: - hosts: diff --git a/charts/theia.cloud/templates/landing-page-ingress.yaml b/charts/theia.cloud/templates/landing-page-ingress.yaml index baa83b4..d89aa70 100644 --- a/charts/theia.cloud/templates/landing-page-ingress.yaml +++ b/charts/theia.cloud/templates/landing-page-ingress.yaml @@ -4,13 +4,13 @@ kind: Ingress metadata: name: landing-page-ingress annotations: - kubernetes.io/ingress.class: nginx {{- if not .Values.hosts.tls }} nginx.ingress.kubernetes.io/ssl-redirect: "false" {{- end }} cert-manager.io/cluster-issuer: {{ tpl (.Values.ingress.clusterIssuer | toString) . }} namespace: {{ .Release.Namespace }} spec: + ingressClassName: nginx {{- if .Values.hosts.tls }} tls: - hosts: diff --git a/charts/theia.cloud/templates/service-ingress-path-based.yaml b/charts/theia.cloud/templates/service-ingress-path-based.yaml index f0f9125..2af04b7 100644 --- a/charts/theia.cloud/templates/service-ingress-path-based.yaml +++ b/charts/theia.cloud/templates/service-ingress-path-based.yaml @@ -4,13 +4,13 @@ kind: Ingress metadata: name: service-ingress annotations: - kubernetes.io/ingress.class: nginx {{- if not .Values.hosts.tls }} nginx.ingress.kubernetes.io/ssl-redirect: "false" {{- end }} nginx.ingress.kubernetes.io/rewrite-target: /service$1 namespace: {{ .Release.Namespace }} spec: + ingressClassName: nginx {{- if .Values.hosts.tls }} tls: - hosts: diff --git a/charts/theia.cloud/templates/service-ingress.yaml b/charts/theia.cloud/templates/service-ingress.yaml index 199a0fb..295c37d 100644 --- a/charts/theia.cloud/templates/service-ingress.yaml +++ b/charts/theia.cloud/templates/service-ingress.yaml @@ -4,7 +4,6 @@ kind: Ingress metadata: name: service-ingress annotations: - kubernetes.io/ingress.class: nginx {{- if not .Values.hosts.tls }} nginx.ingress.kubernetes.io/ssl-redirect: "false" {{- end }} @@ -15,6 +14,7 @@ metadata: nginx.ingress.kubernetes.io/rewrite-target: /service$1 namespace: {{ .Release.Namespace }} spec: + ingressClassName: nginx {{- if .Values.hosts.tls }} tls: - hosts: