Merge pull request #76 from rcarpa/rework_server_and_probes_config_passing (c844d502) · Commits · Rucio / helm-charts

charts/rucio-probes/templates/deployment.yaml

+28 −2

Original line number	Diff line number	Diff line
		apiVersion: v1
		kind: Secret
		metadata:
		name: {{ .Release.Name }}-probes.config.yaml
		labels:
		app: {{ template "rucio-probes.name" . }}
		chart: {{ template "rucio-probes.chart" . }}
		release: "{{ .Release.Name }}"
		heritage: "{{ .Release.Service }}"
		type: Opaque
		data:
		{{- $common_config := .Values.config \| default dict \| mustToPrettyJson \| b64enc }}
		rucio.config.common.json: {{ $common_config \| quote }}
		---
		apiVersion: apps/v1
		kind: Deployment
		metadata:
		@@ -31,12 +45,17 @@ spec:
		labels:
		app: {{ template "rucio-probes.name" . }}
		release: {{ .Release.Name }}
		annotations:
		checksum/config: {{ $common_config \| sha1sum }}
		spec:
		volumes:
		- name: config
		secret:
		secretName: {{ .Release.Name }}-probes.config.yaml
		- configMap:
		defaultMode: 0644
		name: {{ include "rucio-probes.fullname" . }}-jobber-config
		name: config
		name: jobber-config
		{{- if hasKey .Values.probeSettings "ftsProxySecret" }}
		- name: proxy-volume
		secret:
		@@ -46,6 +65,7 @@ spec:

		containers:
		- env:
		{{- if .Values.exportConfigToEnv }}
		{{- range $key1, $val1 := .Values.config }}
		{{- range $key2, $val2 := $val1}}
		- name: RUCIO_CFG_{{ $key1 \| upper }}_{{ $key2 \| upper }}
		@@ -55,12 +75,18 @@ spec:
		key: {{ $key1 }}_{{ $key2 }}
		{{- end}}
		{{- end}}
		{{- end}}
		- name: RUCIO_OVERRIDE_CONFIGS
		value: "/opt/rucio/etc/rucio.config.common.json"
		image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
		imagePullPolicy: {{ .Values.image.pullPolicy }}
		name: {{ .Chart.Name }}
		volumeMounts:
		- name: config
		mountPath: /opt/rucio/etc/rucio.config.common.json
		subPath: rucio.config.common.json
		- mountPath: /etc/jobber-config/
		name: config
		name: jobber-config
		{{- if hasKey .Values.probeSettings "ftsProxySecret" }}
		- mountPath: /opt/proxy
		name: proxy-volume

charts/rucio-probes/values.yaml

+2 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,8 @@ image:
		tag: latest
		pullPolicy: Always

		exportConfigToEnv: true

		# Values needed for some of the probes
		probeSettings:
		# This is the secret for the X509 proxy for FTS. Needed for "check_fts_backlog"

charts/rucio-server/templates/auth_deployment.yaml

+26 −0

Original line number	Diff line number	Diff line
		{{- if gt .Values.authReplicaCount 0.0 -}}
		apiVersion: v1
		kind: Secret
		metadata:
		name: {{ template "rucio.fullname" . }}-auth.config.yaml
		labels:
		app: {{ template "rucio.name" . }}-auth
		chart: "{{ .Chart.Name }}"
		release: "{{ .Release.Name }}"
		heritage: "{{ .Release.Service }}"
		type: Opaque
		data:
		{{- $common_config := .Values.config \| default dict \| mustToPrettyJson \| b64enc }}
		rucio.config.common.json: {{ $common_config \| quote }}
		---
		apiVersion: apps/v1
		kind: Deployment
		metadata:
		@@ -28,11 +42,16 @@ spec:
		labels:
		app: {{ template "rucio.name" . }}-auth
		release: {{ .Release.Name }}
		annotations:
		checksum/config: {{ $common_config \| sha1sum }}
		spec:
		{{- if .Values.serviceAccountName }}
		serviceAccountName: {{ .Values.serviceAccountName }}
		{{- end }}
		volumes:
		- name: config
		secret:
		secretName: {{ template "rucio.fullname" . }}-auth.config.yaml
		- name: httpdlog
		emptyDir: {}
		{{- range $key, $val := .Values.additionalSecrets }}
		@@ -103,6 +122,9 @@ spec:
		periodSeconds: {{ .Values.livenessProbe.authServer.periodSeconds }}
		timeoutSeconds: {{ .Values.livenessProbe.authServer.timeoutSeconds }}
		volumeMounts:
		- name: config
		mountPath: /opt/rucio/etc/rucio.config.common.json
		subPath: rucio.config.common.json
		- name: httpdlog
		mountPath: /var/log/httpd
		{{- range $key, $val := .Values.additionalSecrets }}
		@@ -142,6 +164,7 @@ spec:
		name: {{ template "rucio.fullname" $ }}.cfg
		key: {{ $key }}
		{{- end}}
		{{- if .Values.exportConfigToEnv }}
		{{- range $key1, $val1 := .Values.config }}
		{{- range $key2, $val2 := $val1}}
		- name: RUCIO_CFG_{{ $key1 \| upper }}_{{ $key2 \| upper }}
		@@ -151,6 +174,7 @@ spec:
		key: {{ $key1 }}_{{ $key2 }}
		{{- end}}
		{{- end}}
		{{- end}}
		{{- range $key1, $val1 := .Values.optional_config }}
		- name: {{ $key1 \| upper }}
		value: "{{ $val1 }}"
		@@ -168,6 +192,8 @@ spec:
		value: "{{ .Values.serverType.authServer }}"
		- name: RUCIO_CFG_API_ENDPOINTS
		value: "auth,ping"
		- name: RUCIO_OVERRIDE_CONFIGS
		value: "/opt/rucio/etc/rucio.config.common.json"
		- name: RUCIO_LOG_FORMAT
		value: '{{ .Values.logFormat.authServer }}'
		- name: RUCIO_WSGI_DAEMON_PROCESSES

charts/rucio-server/templates/deployment.yaml

+26 −0

Original line number	Diff line number	Diff line
		{{- if gt .Values.replicaCount 0.0 -}}
		apiVersion: v1
		kind: Secret
		metadata:
		name: {{ template "rucio.fullname" . }}.config.yaml
		labels:
		app: {{ template "rucio.name" . }}
		chart: "{{ .Chart.Name }}"
		release: "{{ .Release.Name }}"
		heritage: "{{ .Release.Service }}"
		type: Opaque
		data:
		{{- $common_config := .Values.config \| default dict \| mustToPrettyJson \| b64enc }}
		rucio.config.common.json: {{ $common_config \| quote }}
		---
		apiVersion: apps/v1
		kind: Deployment
		metadata:
		@@ -28,11 +42,16 @@ spec:
		labels:
		app: {{ template "rucio.name" . }}
		release: {{ .Release.Name }}
		annotations:
		checksum/config: {{ $common_config \| sha1sum }}
		spec:
		{{- if .Values.serviceAccountName }}
		serviceAccountName: {{ .Values.serviceAccountName }}
		{{- end }}
		volumes:
		- name: config
		secret:
		secretName: {{ template "rucio.fullname" . }}.config.yaml
		{{- if .Values.ftsRenewal.enabled }}
		- name: proxy-volume
		secret:
		@@ -96,6 +115,9 @@ spec:
		resources:
		{{ toYaml .Values.serverResources \| indent 12 }}
		volumeMounts:
		- name: config
		mountPath: /opt/rucio/etc/rucio.config.common.json
		subPath: rucio.config.common.json
		{{- if .Values.ftsRenewal.enabled }}
		- name: proxy-volume
		mountPath: /opt/proxy
		@@ -160,6 +182,7 @@ spec:
		name: {{ template "rucio.fullname" $ }}.cfg
		key: {{ $key }}
		{{- end}}
		{{- if .Values.exportConfigToEnv }}
		{{- range $key1, $val1 := .Values.config }}
		{{- range $key2, $val2 := $val1}}
		- name: RUCIO_CFG_{{ $key1 \| upper }}_{{ $key2 \| upper }}
		@@ -169,6 +192,7 @@ spec:
		key: {{ $key1 }}_{{ $key2 }}
		{{- end}}
		{{- end}}
		{{- end}}
		{{- range $key1, $val1 := .Values.optional_config }}
		- name: {{ $key1 \| upper }}
		value: "{{ $val1 }}"
		@@ -184,6 +208,8 @@ spec:
		{{- end }}
		- name: RUCIO_SERVER_TYPE
		value: "{{ .Values.serverType.server }}"
		- name: RUCIO_OVERRIDE_CONFIGS
		value: "/opt/rucio/etc/rucio.config.common.json"
		- name: RUCIO_LOG_FORMAT
		value: '{{ .Values.logFormat.server }}'
		- name: RUCIO_WSGI_DAEMON_PROCESSES

charts/rucio-server/templates/trace_deployment.yaml

+26 −0

Original line number	Diff line number	Diff line
		{{- if gt .Values.traceReplicaCount 0.0 -}}
		apiVersion: v1
		kind: Secret
		metadata:
		name: {{ template "rucio.fullname" . }}-trace.config.yaml
		labels:
		app: {{ template "rucio.name" . }}-trace
		chart: "{{ .Chart.Name }}"
		release: "{{ .Release.Name }}"
		heritage: "{{ .Release.Service }}"
		type: Opaque
		data:
		{{- $common_config := .Values.config \| default dict \| mustToPrettyJson \| b64enc }}
		rucio.config.common.json: {{ $common_config \| quote }}
		---
		apiVersion: apps/v1
		kind: Deployment
		metadata:
		@@ -28,11 +42,16 @@ spec:
		labels:
		app: {{ template "rucio.name" . }}-trace
		release: {{ .Release.Name }}
		annotations:
		checksum/config: {{ $common_config \| sha1sum }}
		spec:
		{{- if .Values.serviceAccountName }}
		serviceAccountName: {{ .Values.serviceAccountName }}
		{{- end }}
		volumes:
		- name: config
		secret:
		secretName: {{ template "rucio.fullname" . }}-trace.config.yaml
		- name: httpdlog
		emptyDir: {}
		{{- range $key, $val := .Values.additionalSecrets }}
		@@ -98,6 +117,9 @@ spec:
		periodSeconds: {{ .Values.livenessProbe.traceServer.periodSeconds }}
		timeoutSeconds: {{ .Values.livenessProbe.traceServer.timeoutSeconds }}
		volumeMounts:
		- name: config
		mountPath: /opt/rucio/etc/rucio.config.common.json
		subPath: rucio.config.common.json
		- name: httpdlog
		mountPath: /var/log/httpd
		{{- if .Values.useSSL.traceServer }}
		@@ -133,6 +155,7 @@ spec:
		name: {{ template "rucio.fullname" $ }}.cfg
		key: {{ $key }}
		{{- end}}
		{{- if .Values.exportConfigToEnv }}
		{{- range $key1, $val1 := .Values.config }}
		{{- range $key2, $val2 := $val1}}
		- name: RUCIO_CFG_{{ $key1 \| upper }}_{{ $key2 \| upper }}
		@@ -142,6 +165,7 @@ spec:
		key: {{ $key1 }}_{{ $key2 }}
		{{- end}}
		{{- end}}
		{{- end}}
		{{- if .Values.useSSL.traceServer }}
		- name: RUCIO_ENABLE_SSL
		value: "True"
		@@ -153,6 +177,8 @@ spec:
		{{- end }}
		- name: RUCIO_SERVER_TYPE
		value: "{{ .Values.serverType.traceServer }}"
		- name: RUCIO_OVERRIDE_CONFIGS
		value: "/opt/rucio/etc/rucio.config.common.json"
		- name: RUCIO_LOG_FORMAT
		value: '{{ .Values.logFormat.traceServer }}'
		- name: RUCIO_WSGI_DAEMON_PROCESSES