public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart/jenkins-operator/Chart.yaml
View File

@ -2,5 +2,5 @@ apiVersion: v2
appVersion: "0.4.0" appVersion: "0.4.0"
description: Kubernetes native operator which fully manages Jenkins on Kubernetes description: Kubernetes native operator which fully manages Jenkins on Kubernetes
name: jenkins-operator 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 icon: https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/assets/jenkins-operator-icon.png

16
chart/jenkins-operator/templates/jenkins.yaml
View File

@ -10,26 +10,30 @@ metadata:
spec: spec:
configurationAsCode: configurationAsCode:
configurations: configurations:
{{- range .Values.jenkins.configuration.configurationAsCode }} {{- range .Values.jenkins.configuration.configurationAsCode }}
- name: {{ .configMapName }} - name: {{ .configMapName }}
{{- end }} {{- end }}
{{- if .Values.jenkins.configuration.configurationAsCode }}
secret: secret:
{{- if .Values.jenkins.configuration.secretRefName }} {{- if .Values.jenkins.configuration.secretRefName }}
name: {{ .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 }} name: jenkins-{{ .Values.jenkins.name }}
{{- end }} {{- end }}
{{- end }}
groovyScripts: groovyScripts:
configurations: configurations:
{{- range .Values.jenkins.configuration.groovyScripts }} {{- range .Values.jenkins.configuration.groovyScripts }}
- name: {{ .configMapName }} - name: {{ .configMapName }}
{{- end }} {{- end }}
{{- if .Values.jenkins.configuration.groovyScripts }}
secret: secret:
{{- if .Values.jenkins.configuration.secretRefName }} {{- if .Values.jenkins.configuration.secretRefName }}
name: {{ .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 }} name: jenkins-{{ .Values.jenkins.name }}
{{- end }} {{- end }}
{{- end }}
{{- if .Values.jenkins.backup.enabled }} {{- if .Values.jenkins.backup.enabled }}
backup: backup:
containerName: {{ .Values.jenkins.backup.containerName }} containerName: {{ .Values.jenkins.backup.containerName }}