Merge branch '31-ingress-class-name' into jf/0.8.1-MS1

eclipse-theia · Jul 28, 2023 · 0f3f21b · 0f3f21b
2 parents 8535b17 + 5abf8b3
commit 0f3f21b
Show file tree

Hide file tree

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