add ingressClassName option (rucio#136)

* add ingressClassName option rucio#135 --------- Co-authored-by: Thomas Beermann <[email protected]>
rcarpa · Feb 24, 2023 · e2e19cb · e2e19cb
1 parent 1fb7c29
commit e2e19cb
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 19 deletions.
diff --git a/charts/rucio-server/Chart.yaml b/charts/rucio-server/Chart.yaml
@@ -1,5 +1,5 @@
 name: rucio-server
-version: 1.30.10
+version: 1.30.11
 apiVersion: v1
 description: A Helm chart to deploy servers for Rucio
 keywords:

diff --git a/charts/rucio-server/templates/auth_ingress.yaml b/charts/rucio-server/templates/auth_ingress.yaml
@@ -17,6 +17,9 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+{{- if .Values.authIngress.ingressClassName }}
+  ingressClassName: {{ .Values.authIngress.ingressClassName }}
+{{ end }}
 {{- if .Values.authIngress.tls }}
   tls:
   {{- range .Values.authIngress.tls }}

diff --git a/charts/rucio-server/templates/ingress.yaml b/charts/rucio-server/templates/ingress.yaml
@@ -17,6 +17,9 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+{{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+{{ end }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}

diff --git a/charts/rucio-server/templates/trace_ingress.yaml b/charts/rucio-server/templates/trace_ingress.yaml
@@ -17,6 +17,9 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+{{- if .Values.traceIngress.ingressClassName }}
+  ingressClassName: {{ .Values.traceIngress.ingressClassName }}
+{{ end }}
 {{- if .Values.traceIngress.tls }}
   tls:
   {{- range .Values.traceIngress.tls }}

diff --git a/charts/rucio-server/values.yaml b/charts/rucio-server/values.yaml
@@ -254,8 +254,8 @@ httpd_config:
 
 ingress:
   enabled: false
+  # ingressClassName: traefik
   annotations: {}
-    # kubernetes.io/ingress.class: traefik
     # traefik.ingress.kubernetes.io/frontend-entry-points: http
     # traefik.ingress.kubernetes.io/redirect-entry-point: https
   path: /
@@ -283,8 +283,8 @@ ingress:
 
 authIngress:
   enabled: false
+  # ingressClassName: traefik
   annotations: {}
-    # kubernetes.io/ingress.class: traefik
     # traefik.ingress.kubernetes.io/frontend-entry-points: http
     # traefik.ingress.kubernetes.io/redirect-entry-point: https
   path: /auth
@@ -312,8 +312,8 @@ authIngress:
 
 traceIngress:
   enabled: false
+  # ingressClassName: traefik
   annotations: {}
-    # kubernetes.io/ingress.class: traefik
     # traefik.ingress.kubernetes.io/frontend-entry-points: http
     # traefik.ingress.kubernetes.io/redirect-entry-point: https
   path: /traces

diff --git a/charts/rucio-ui/Chart.yaml b/charts/rucio-ui/Chart.yaml
@@ -1,5 +1,5 @@
 name: rucio-ui
-version: 1.30.0
+version: 1.30.1
 apiVersion: v1
 description: A Helm chart to deploy webui servers for Rucio
 keywords:

diff --git a/charts/rucio-ui/templates/ingress.yaml b/charts/rucio-ui/templates/ingress.yaml
@@ -16,6 +16,9 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+{{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+{{ end }}
   rules:
   {{- range .Values.ingress.hosts }}
     - host: {{ . }}

diff --git a/charts/rucio-ui/values.yaml b/charts/rucio-ui/values.yaml
@@ -31,16 +31,14 @@ minReadySeconds: 5
 
 proxy:
   rucioProxy: ""
-  #rucioProxyScheme: "https"
+  # rucioProxyScheme: "https"
   rucioAuthProxy: ""
-  #rucioAuthProxyScheme: "https"
-  
+  # rucioAuthProxyScheme: "https"
+
 ingress:
-  enabled: true
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+  enabled: false
+  # ingressClassName: traefik
+  annotations: {}
   path: /
   hosts: []
   #   - my.rucio.test

diff --git a/charts/rucio-webui/Chart.yaml b/charts/rucio-webui/Chart.yaml
@@ -1,5 +1,5 @@
 name: rucio-webui
-version: 1.30.0
+version: 1.30.1
 apiVersion: v1
 description: A Helm chart to deploy the new webui (2.0) servers for Rucio
 keywords:
@@ -11,4 +11,3 @@ sources:
 maintainers:
   - name: Rucio development team
     email: [email protected]
-
diff --git a/charts/rucio-webui/templates/ingress.yaml b/charts/rucio-webui/templates/ingress.yaml
@@ -17,6 +17,9 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+{{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+{{ end }}
   rules:
   {{- range .Values.ingress.hosts }}
     - host: {{ . }}

diff --git a/charts/rucio-webui/values.yaml b/charts/rucio-webui/values.yaml
@@ -25,12 +25,12 @@ service:
   type: NodePort
   # Run the webui server on port 443 instead of 80 and accept X509 certificates
   useSSL: true
-  # nodePort: 
+  # nodePort:
 
 ingress:
   enabled: false
+  # ingressClassName: traefik
   annotations:
-    kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/ssl-passthrough: "true"
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
   path: /
@@ -65,14 +65,14 @@ config:
     # max_request_workers: "1280"
     # max_connections_per_child: "2048"
 
-  ## Rucio WebUI specific configuration for apache 
+  ## Rucio WebUI specific configuration for apache
   httpdWebui:
     hostname: kube-playground-7p7333rqr5xx-node-0.cern.ch
     # server_admin:
     logLevel: 'info'
 
   ## Configuration for OIDC providers
-  oidcProviders: #[]
+  oidcProviders:  # []
     - name: "CERN SSO"
       clientId: "rucio-webui"
       authorizationEndpoint: "https://login.cern.ch/adfs/oauth2/authorize"