Improve secret management in helm chart

This commit is contained in:
Jakub Al-Khalili 2020-05-29 11:46:43 +02:00
parent 3cc726dfaf
commit afe2d41dcc
2 changed files with 11 additions and 7 deletions

View File

@ -2,5 +2,5 @@ apiVersion: v2
appVersion: "0.4.0"
description: Kubernetes native operator which fully manages Jenkins on Kubernetes
name: jenkins-operator
version: 0.3.0
version: 0.3.1
icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png

View File

@ -10,26 +10,30 @@ metadata:
spec:
configurationAsCode:
configurations:
{{- range .Values.jenkins.configuration.configurationAsCode }}
{{- range .Values.jenkins.configuration.configurationAsCode }}
- name: {{ .configMapName }}
{{- end }}
{{- end }}
{{- if .Values.jenkins.configuration.configurationAsCode }}
secret:
{{- if .Values.jenkins.configuration.secretRefName }}
name: {{ .Values.jenkins.configuration.secretRefName }}
{{ else if .Values.jenkins.configuration.secretData }}
{{- else if .Values.jenkins.configuration.secretData }}
name: jenkins-{{ .Values.jenkins.name }}
{{- end }}
{{- end }}
groovyScripts:
configurations:
{{- range .Values.jenkins.configuration.groovyScripts }}
{{- range .Values.jenkins.configuration.groovyScripts }}
- name: {{ .configMapName }}
{{- end }}
{{- end }}
{{- if .Values.jenkins.configuration.groovyScripts }}
secret:
{{- if .Values.jenkins.configuration.secretRefName }}
name: {{ .Values.jenkins.configuration.secretRefName }}
{{ else if .Values.jenkins.configuration.secretData }}
{{- else if .Values.jenkins.configuration.secretData }}
name: jenkins-{{ .Values.jenkins.name }}
{{- end }}
{{- end }}
{{- if .Values.jenkins.backup.enabled }}
backup:
containerName: {{ .Values.jenkins.backup.containerName }}