ui: add support NodePort and Loadbalancer service types

charts/rucio-ui/Chart.yaml

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

charts/rucio-ui/templates/service.yaml

@@ -13,16 +13,28 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
-  type: {{ $.Values.service.type }}
+  type: {{ .Values.service.type }}
   ports:
-    - port: {{ ternary 443 80 $.Values.service.useSSL }}
-      targetPort: {{ ternary "https" "http" $.Values.service.useSSL }}
-      protocol: TCP
-      {{- if $.Values.service.nodePort }}
-      nodePort: {{ $.Values.service.nodePort }}
-      {{- end }}
-      name: {{ ternary "https" "http" $.Values.service.useSSL }}
+    - port: {{ .Values.service.port }}
+      targetPort: {{ .Values.service.targetPort }}
+      protocol: {{ .Values.service.protocol }}
+      name: {{ .Values.service.name }}
   selector:
     app: {{ template "rucio.name" . }}
     release: {{ .Release.Name }}
+{{- if .Values.service.nodePort }}
+  nodePort: {{ .Values.service.nodePort }}
+{{- end }}
+{{- if .Values.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+{{- end }}
+{{- if .Values.service.loadBalancerClass }}
+  loadBalancerClass: {{ .Values.service.loadBalancerClass }}
+{{- end }}
+{{- if .Values.service.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
+{{- end }}
+{{- if .Values.service.allocateLoadBalancerNodePorts }}
+  allocateLoadBalancerNodePorts: {{ .Values.service.allocateLoadBalancerNodePorts }}
+{{- end }}
 {{- end }}

charts/rucio-ui/values.yaml

@@ -11,13 +11,26 @@ useDeprecatedImplicitSecrets: true
 exposeErrorLogs: true
 
 service:
-  type: NodePort
-  # Run the webui server on port 443 instead of 80 and accept X509 certificates and proxies
-  useSSL: true
-  port: 443
-  targetPort: https
-  nodePort: 30734
-  annotations: []
+  # Enable useSSL and run the webui server on port 443 instead of 80 in order to
+  # accept X509 certificates and proxies for authentication
+  useSSL: false
+  # Type of service to create, supports NodePort, LoadBalancer, and ClusterIP
+  type: ClusterIP
+  port: 80
+  targetPort: 80
+  protocol: TCP
+  name: http
+  # if service type is NodePort, set the nodePort value
+  # nodePort: 30734
+  annotations:
+    {}
+    # loadbalancer.openstack.org/network-id: "<id>"
+    # service.beta.kubernetes.io/openstack-internal-load-balancer: "true"
+    # loadbalancer.openstack.org/cascade-delete: "false"
+  loadBalancerIP: null
+  loadBalancerClass: null
+  externalTrafficPolicy: null
+  allocateLoadBalancerNodePorts: true
 
 image:
   repository: rucio/rucio-ui