Allow tenant config file to be managed externally

Add options so that a user can create an externally managed secret
with the tenant config file and point the scheduler to that instead
of the one written by the helm values.

Change-Id: I39cca9dede3fede88a8d38a63196c0c44fae219b
This commit is contained in:
James E. Blair
2020-01-10 15:57:12 -08:00
parent 975cac9899
commit 903a179745
3 changed files with 12 additions and 2 deletions

View File

@@ -34,11 +34,20 @@ spec:
mountPath: /etc/zuul mountPath: /etc/zuul
- name: {{ include "zuul.fullname" . }}-scheduler - name: {{ include "zuul.fullname" . }}-scheduler
mountPath: /var/lib/zuul mountPath: /var/lib/zuul
{{- if .Values.scheduler.tenantConfigSecret }}
- name: zuul-tenant-config
mountPath: /etc/zuul/tenant
{{- end }}
volumes: volumes:
- name: zuul-config - name: zuul-config
secret: secret:
secretName: {{ include "zuul.fullname" . }} secretName: {{ include "zuul.fullname" . }}
defaultMode: 256 defaultMode: 256
{{- if .Values.scheduler.tenantConfigSecret }}
- name: zuul-tenant-config
secret:
secretName: {{ .Values.scheduler.tenantConfigSecret }}
{{- end }}
{{- with .Values.tolerations }} {{- with .Values.tolerations }}
tolerations: tolerations:
{{ toYaml . | indent 8 }} {{ toYaml . | indent 8 }}

View File

@@ -21,7 +21,7 @@ stringData:
root=https://{{ .Values.web.host }} root=https://{{ .Values.web.host }}
port={{ .Values.web.port }} port={{ .Values.web.port }}
[scheduler] [scheduler]
tenant_config=/etc/zuul/main.yaml tenant_config={{ .Values.scheduler.tenantConfigPath }}
[executor] [executor]
private_key_file={{ .Values.executor.private_key_file }} private_key_file={{ .Values.executor.private_key_file }}
{{ range $connection, $options := .Values.connections }} {{ range $connection, $options := .Values.connections }}
@@ -34,4 +34,4 @@ stringData:
{{ toYaml .Values.tenantConfig | indent 4 }} {{ toYaml .Values.tenantConfig | indent 4 }}
{{ if .Values.extraFiles }} {{ if .Values.extraFiles }}
{{ (toYaml .Values.extraFiles | indent 2) }} {{ (toYaml .Values.extraFiles | indent 2) }}
{{ end }} {{ end }}

View File

@@ -14,6 +14,7 @@ scheduler:
enabled: true enabled: true
gearman: gearman:
port: 4730 port: 4730
tenantConfigPath: /etc/zuul/main.yaml
web: web:
enabled: true enabled: true