diff --git a/charts/rucio-webui/Chart.yaml b/charts/rucio-webui/Chart.yaml index 71c381a..fc91ee6 100644 --- a/charts/rucio-webui/Chart.yaml +++ b/charts/rucio-webui/Chart.yaml @@ -1,7 +1,7 @@ name: rucio-webui version: 33.0.1 apiVersion: v1 -description: A Helm chart to deploy the new Rucio Webui +description: A Helm chart to deploy the new Rucio Webui keywords: - data-management - science diff --git a/charts/rucio-webui/templates/deployment.yaml b/charts/rucio-webui/templates/deployment.yaml index 74f0cc1..8f2c357 100644 --- a/charts/rucio-webui/templates/deployment.yaml +++ b/charts/rucio-webui/templates/deployment.yaml @@ -50,6 +50,8 @@ spec: secretName: {{ template "rucio.fullname" . }}.config.yaml - name: httpdlog emptyDir: {} + - name: webui-log + emptyDir: {} {{- if eq .Values.useSSL true }} - name: hostcert secret: @@ -72,13 +74,21 @@ spec: claimName: {{ $val.name }} {{- end}} containers: - {{- if .Values.exposeErrorLogs }} + {{- if .Values.config.logs.exposeHttpdLogs }} - name: httpd-error-log image: busybox args: [/bin/sh, -c, 'tail -n+1 -F /var/log/httpd/error_log'] volumeMounts: - name: httpdlog mountPath: /var/log/httpd + {{- end }} + {{- if .Values.config.logs.exposeWebuiLogs }} + - name: webui-log + image: busybox + args: [/bin/sh, -c, 'tail -n+1 -F /var/log/webui/rucio-webui-out.log /var/log/webui/rucio-webui-error.log'] + volumeMounts: + - name: webui-log + mountPath: /var/log/webui/ {{- end }} - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" @@ -93,8 +103,14 @@ spec: protocol: TCP {{- end }} volumeMounts: + {{- if .Values.config.logs.exposeHttpdLogs }} - name: httpdlog mountPath: /var/log/httpd + {{- end }} + {{- if .Values.config.logs.exposeWebuiLogs }} + - name: webui-log + mountPath: /root/.pm2/logs/ + {{- end }} {{- if .Values.useSSL }} - name: hostcert mountPath: /etc/grid-security/hostcert.pem diff --git a/charts/rucio-webui/values.yaml b/charts/rucio-webui/values.yaml index d4cdaa3..8cbf7c2 100644 --- a/charts/rucio-webui/values.yaml +++ b/charts/rucio-webui/values.yaml @@ -29,7 +29,8 @@ service: targetPort: 80 protocol: TCP name: http - annotations: {} + annotations: + {} # loadbalancer.openstack.org/network-id: "" # service.beta.kubernetes.io/openstack-internal-load-balancer: "true" # loadbalancer.openstack.org/cascade-delete: "false" @@ -81,13 +82,13 @@ config: hostname: "webui-host" project_url: "https://rucio.cern.ch" multivo_enabled: "False" - # A csv string of vos + # A csv string of vos containing their short names. For example: "def,atl,cms" vo_list: "def" vo_default: "def" oidc_enabled: "False" - # A csv string of oidc providers + # A csv string of names of supported oidc providers that will be configured in the webui. For example: "cern,indico" oidc_providers: "" - + oidc_providers: cern: client_id: "" @@ -103,6 +104,15 @@ config: name: "default" oidc_enabled: "False" oidc_providers: "" + # Example of a second VO + # atl: + # name: "atlas" + # oidc_enabled: "False" + # oidc_providers: "" + + logs: + exposeHttpdLogs: true + exposeWebuiLogs: true # additional environment variables to set in the webui container optionalConfig: {}