Fixes for Rucio UI ( not WebUI) 33.x charts

charts/rucio-ui/Chart.yaml

@@ -1,5 +1,5 @@
 name: rucio-ui
-version: 34.0.0
+version: 34.0.1
 apiVersion: v1
 description: A Helm chart to deploy webui servers for Rucio
 keywords:

charts/rucio-ui/templates/deployment.yaml

@@ -156,8 +156,8 @@ spec:
             - name: RUCIO_AUTH_PROXY_SCHEME
               value: {{ .Values.proxy.rucioAuthProxyScheme }}
 {{- end }}
-            - name: RUCIO_DEFINE_ALIASES
-              value: "True"
+            - name: RUCIO_HOSTNAME
+              value: {{ .Values.httpd_config.rucio_hostname }}
             - name: RUCIO_OVERRIDE_CONFIGS
               value: "/opt/rucio/etc/conf.d/"
             - name: RUCIO_LOG_FORMAT

charts/rucio-ui/templates/ingress.yaml

@@ -1,3 +1,4 @@
+{{- if gt .Values.replicaCount 0.0 -}}
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "rucio.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
@@ -38,3 +39,4 @@ spec:
     {{- end }}
   {{- end }}
 {{- end }}
+{{- end }}

charts/rucio-ui/templates/service.yaml

@@ -15,10 +15,13 @@ metadata:
 spec:
   type: {{ $.Values.service.type }}
   ports:
-    - port: {{ $.Values.service.port }}
-      targetPort: {{ $.Values.service.targetPort }}
+    - port: {{ ternary 443 80 $.Values.service.useSSL }}
+      targetPort: {{ ternary "https" "http" $.Values.service.useSSL }}
       protocol: TCP
-      name: {{ $.Values.service.portName }}
+      {{- if $.Values.service.nodePort }}
+      nodePort: {{ $.Values.service.nodePort }}
+      {{- end }}
+      name: {{ ternary "https" "http" $.Values.service.useSSL }}
   selector:
     app: {{ template "rucio.name" . }}
     release: {{ .Release.Name }}

charts/rucio-ui/values.yaml

@@ -16,11 +16,12 @@ service:
   useSSL: true
   port: 443
   targetPort: https
-  portName: https
+  nodePort: 30734
+  annotations: []
 
 image:
   repository: rucio/rucio-ui
-  tag: release-1.21.12
+  tag: release-34.0.0
   pullPolicy: Always
 
 imagePullSecrets: []
@@ -35,20 +36,46 @@ strategy:
 minReadySeconds: 5
 
 proxy:
-  rucioProxy: ""
-  # rucioProxyScheme: "https"
-  rucioAuthProxy: ""
-  # rucioAuthProxyScheme: "https"
+  rucioProxy: "<rucio-server-host>"
+  rucioProxyScheme: "https"
+  rucioAuthProxy: "<rucio-auth-server-host>"
+  rucioAuthProxyScheme: "https"
 
 ingress:
   enabled: false
   # ingressClassName: traefik
-  annotations: {}
+  annotations:
+    {}
+    # traefik.ingress.kubernetes.io/frontend-entry-points: http
+    # traefik.ingress.kubernetes.io/redirect-entry-point: https
   path: /
   hosts: []
   #   - my.rucio.test
-
-secretMounts: {}
+  tls:
+    - secretName: rucio-server.tls-secret
+  secrets:
+  ## If you're providing your own certificates, please use this to add the certificates as secrets
+  ## key and certificate should start with -----BEGIN CERTIFICATE----- or
+  ## -----BEGIN RSA PRIVATE KEY-----
+  ##
+  ## name should line up with a tlsSecret set further up
+  ## If you're using kube-lego, this is unneeded, as it will create the secret for you if it is not set
+  ##
+  ## It is also possible to create and manage the certificates outside of this helm chart
+  ## Please see README.md for more information
+  # - name: rucio-server.tls-secret
+  #   key: |+
+  #     -----BEGIN RSA PRIVATE KEY-----
+  #     -----END RSA PRIVATE KEY-----
+  #   certificate: |+
+  #     -----BEGIN CERTIFICATE-----
+  #     -----END CERTIFICATE-----
+
+## Additional secrets to be mounted as files in the ui container.
+## Use this to mount certificates, ca-files for httpd.
+## You can also use this to mount sections of rucio.cfg file. In this case, the mount path
+## should be in the /opt/rucio/etc/conf.d/<file_name>.cfg format.
+secretMounts:
 # - volumeName: gcssecret
 #   secretName: gcssecret
 #   mountPath: /opt/rucio/etc/gcs_rucio.json
@@ -57,6 +84,7 @@ secretMounts: {}
 ## values used to configure apache
 httpd_config:
   legacy_dn: "False"
+  rucio_hostname: "my-rucio-ui.example.com"
   # mpm_mode: "event"
   # start_servers: "1"
   # min_spare_threads: "1"
@@ -68,14 +96,15 @@ httpd_config:
 ## values used to configure Rucio
 config:
   # common:
-    ## config.common.logdir: the default directoy to write logs to (default: "/var/log/rucio")
-    # logdir: "/var/log/rucio"
-    ## config.common.logdir: the max loglevel (default: "DEBUG")
-    # loglevel: "DEBUG"
-    ## config.common.mailtemplatedir: directory containing the mail templates (default: "/opt/rucio/etc/mail_templates")
-    # mailtemplatedir: "/opt/rucio/etc/mail_templates"
-
-  database: {}
+  ## config.common.logdir: the default directoy to write logs to (default: "/var/log/rucio")
+  # logdir: "/var/log/rucio"
+  ## config.common.logdir: the max loglevel (default: "DEBUG")
+  # loglevel: "DEBUG"
+  ## config.common.mailtemplatedir: directory containing the mail templates (default: "/opt/rucio/etc/mail_templates")
+  # mailtemplatedir: "/opt/rucio/etc/mail_templates"
+
+  database:
+    {}
     ## config.database.default: the connection string for the database (default: "sqlite:////tmp/rucio.db")
     # default: "sqlite:////tmp/rucio.db"
     ## config.database.schema: the schema used in the DB. only necessary when using Oracle.
@@ -98,23 +127,23 @@ config:
     # powuserpassword: ""
 
   # policy:
-    ## config.permission.policy: (default "generic")
-    # permission: "generic"
-    ## config.permission.schema: (default "generic")
-    # schema: "generic"
-    ## config.permission.lfn2pfn_algorithm_default: (default "hash")
-    # lfn2pfn_algorithm_default: "hash"
-    ## config.permission.support: (default "https://github.com/rucio/rucio/issues/")
-    # support: "https://github.com/rucio/rucio/issues/"
-    ## config.permission.support_rucio: (default "https://github.com/rucio/rucio/issues/")
-    # support_rucio: "https://github.com/rucio/rucio/issues/"
-
-  ## Only necessary for webui deployments
-  # webui:
-    ## config.webui.usercert:  (default "/opt/rucio/etc/usercert_with_key.pem")
-    # usercert: "/opt/rucio/etc/usercert_with_key.pem"
-
-resources: {}
+  ## config.permission.policy: (default "generic")
+  # permission: "generic"
+  ## config.permission.schema: (default "generic")
+  # schema: "generic"
+  ## config.permission.lfn2pfn_algorithm_default: (default "hash")
+  # lfn2pfn_algorithm_default: "hash"
+  ## config.permission.support: (default "https://github.com/rucio/rucio/issues/")
+  # support: "https://github.com/rucio/rucio/issues/"
+  ## config.permission.support_rucio: (default "https://github.com/rucio/rucio/issues/")
+  # support_rucio: "https://github.com/rucio/rucio/issues/"
+
+# Additional environment variables to be set in the container.
+# For a list, please see: https://github.com/rucio/containers/blob/master/ui/README.md
+optional_config: {}
+
+resources:
+  {}
   # limits:
   #  cpu: 100m
   #  memory: 128Mi