fix(helm): use ingressClassName instead of deprecated annotation (#794)

Closes #742
reanahub · Apr 17, 2024 · b4f4633 · b4f4633
1 parent 8ce4a8d
commit b4f4633
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/helm/reana/README.md b/helm/reana/README.md
@@ -67,10 +67,10 @@ This Helm automatically prefixes all names using the release name to avoid colli
 | `eos.enabled`                                            | **[CERN only]** Enable EOS support inside the cluster                                | false                                           |
 | `fullnameOverride`                                       | Name to override the `reana.prefix`                                                  | None                                            |
 | `infrastructure_storage`                                 | Optional volume used by REANA's infrastructure (i.e. database and message broker). It has the same settings as `shared_storage` | {}   |
-| `ingress.annotations.kubernetes.io/ingress.class`        | Type of ingress controller                                                           | traefik                                         |
 | `ingress.annotations.traefik.ingress.kubernetes.io/router.entrypoints` | Entrypoints allowed by the ingress controller                          | "web,websecure"                                 |
 | `ingress.enabled`                                        | Create an ingress resource to access the REANA instance from outside the cluster     | true                                            |
 | `ingress.extra`                                          | An array of extra ingress resources. They can be configured in the same way as the default ingress, with the addition of `ingress.extra[].name`. | [] |
+| `ingress.ingress_class_name`                             | Name of the Ingress class to use. Default value (`null`) will use the cluster's default Ingress class. | null                          |
 | `ingress.tls.hosts`                                      | List of hosts included in the TLS certificate, needed by cert-manager                | []                                              |
 | `ingress.tls.secret_name`                                | Name of the Kubernetes secret containing the TLS certificate to be used              | None                                            |
 | `ingress.tls.self_signed_cert`                           | Enable the generation of a self-signed TLS certificate                               | true                                            |

diff --git a/helm/reana/templates/ingress.yaml b/helm/reana/templates/ingress.yaml
@@ -15,6 +15,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if .ingress_class_name }}
+  ingressClassName: {{ .ingress_class_name | quote }}
+  {{- end }}
   {{- with .tls }}
   {{- if and .self_signed_cert .secret_name }}
     {{- fail "Cannot set `.tls.secret_name` and `.tls.self_signed_cert` at the same time" }}

diff --git a/helm/reana/templates/reana-workflow-controller.yaml b/helm/reana/templates/reana-workflow-controller.yaml
@@ -86,6 +86,10 @@ spec:
             value: {{ .Values.namespace_runtime | default .Release.Namespace }}
           - name: REANA_INGRESS_ANNOTATIONS
             value: {{ .Values.ingress.annotations | toJson | quote }}
+          {{- if .Values.ingress.ingress_class_name }}
+          - name: REANA_INGRESS_CLASS_NAME
+            value: {{ .Values.ingress.ingress_class_name | quote }}
+          {{- end }}
           - name: REANA_DEFAULT_QUOTA_CPU_LIMIT
             value: {{ .Values.quota.default_cpu_limit | default 0 | quote }}
           - name: REANA_DEFAULT_QUOTA_DISK_LIMIT

diff --git a/helm/reana/values.yaml b/helm/reana/values.yaml
@@ -135,8 +135,8 @@ notifications:
 # Accessing the cluster from outside world
 ingress:
   enabled: true
+  ingress_class_name: null
   annotations:
-    kubernetes.io/ingress.class: traefik
     traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
   tls:
     self_signed_cert: true
@@ -163,6 +163,9 @@ traefik:
     enabled: true
   service:
     type: NodePort
+  ingressClass:
+    enabled: true
+    isDefaultClass: true
 
 # Quota
 quota: