#31: Replace deprecated ingress class annotations with ingressClassName

Contributed on behalf of STMicroelectronics Signed-off-by: Lucas Koehler <lkoehler@eclipsesource.com>
eclipse-theia · Jul 27, 2023 · 5abf8b3 · 5abf8b3
1 parent 1ad6bd6
commit 5abf8b3
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: