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

Fixes #687 (#688) 

This is necessary in order to be able to provide the annotations attached to the
service account associated with the Jenkins master instance.

Co-authored-by: Vanio Begic <vanio.begic@capgemini.com>
This commit is contained in:
thecooldrop 2021-12-23 13:37:08 +01:00 committed by GitHub
parent 2724ec2f70
commit 0f507409cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,9 @@ spec:
{{- with .Values.jenkins.notifications }} {{- with .Values.jenkins.notifications }}
notifications: {{ toYaml . | nindent 4 }} notifications: {{ toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with .Values.jenkins.serviceAccount }}
serviceAccount: {{ toYaml . | nindent 4 }}
{{- end }}
master: master:
{{- with .Values.jenkins.labels }} {{- with .Values.jenkins.labels }}
labels: {{ toYaml . | nindent 6 }} labels: {{ toYaml . | nindent 6 }}

5
chart/jenkins-operator/values.yaml
View File

@ -59,6 +59,11 @@ jenkins:
# See https://jenkinsci.github.io/kubernetes-operator/docs/getting-started/latest/notifications/ for more info # See https://jenkinsci.github.io/kubernetes-operator/docs/getting-started/latest/notifications/ for more info
notifications: [] notifications: []
# Enables customization of the Service Account attached to the master Jenkins instance via annotations
# https://jenkinsci.github.io/kubernetes-operator/docs/getting-started/latest/schema/#github.com/jenkinsci/kubernetes-operator/api/v1alpha2.ServiceAccount
serviceAccount:
annotations: {}
# basePlugins are plugins installed and required by the operator # basePlugins are plugins installed and required by the operator
# Shouldn't contain plugins defined by user # Shouldn't contain plugins defined by user
# You can change their versions here # You can change their versions here