diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 079d9e3e44..762d0e2962 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: jenkins home: https://jenkins.io/ -version: 1.3.6 +version: 1.4.0 appVersion: lts description: Open source continuous integration server. It supports multiple SCM tools including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based diff --git a/stable/jenkins/README.md b/stable/jenkins/README.md index 32f23f8c56..ed8a62ab4b 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -65,7 +65,7 @@ The following tables list the configurable parameters of the Jenkins chart and t | `namespaceOverride` | Override the deployment namespace | Not set (`Release.Namespace`) | | `master.componentName` | Jenkins master name | `jenkins-master` | | `master.image` | Master image name | `jenkins/jenkins` | -| `master.imageTag` | Master image tag | `lts` | +| `master.tag` | Master image tag | `lts` | | `master.imagePullPolicy` | Master image pull policy | `Always` | | `master.imagePullSecret` | Master image pull secret | Not set | | `master.numExecutors` | Set Number of executors | 0 | @@ -176,7 +176,7 @@ Some third-party systems, e.g. GitHub, use HTML-formatted data in their payload | `agent.enabled` | Enable Kubernetes plugin jnlp-agent podTemplate | `true` | | `agent.image` | Agent image name | `jenkins/jnlp-slave` | | `agent.imagePullSecret` | Agent image pull secret | Not set | -| `agent.imageTag` | Agent image tag | `3.27-1` | +| `agent.tag` | Agent image tag | `3.27-1` | | `agent.privileged` | Agent privileged container | `false` | | `agent.resources` | Resources allocation (Requests and Limits) | `{requests: {cpu: 200m, memory: 256Mi}, limits: {cpu: 200m, memory: 256Mi}}`| | `agent.volumes` | Additional volumes | `nil` | diff --git a/stable/jenkins/templates/NOTES.txt b/stable/jenkins/templates/NOTES.txt index c6919ba0dd..c4e54f6f6f 100644 --- a/stable/jenkins/templates/NOTES.txt +++ b/stable/jenkins/templates/NOTES.txt @@ -44,3 +44,17 @@ https://jenkins.io/projects/jcasc/ ###### the Jenkins pod is terminated. ##### ################################################################################# {{- end }} + +{{- if .Values.master.imageTag }} +################################################################################# +###### WARNING: `master.imageTag` will be obsoleted soon!!! ##### +###### It has been renamed to `master.tag`. ##### +################################################################################# +{{- end }} + +{{- if .Values.agent.imageTag }} +################################################################################# +###### WARNING: `agent.imageTag` will be obsoleted soon!!! ##### +###### It has been renamed to `agent.tag`. ##### +################################################################################# +{{- end }} diff --git a/stable/jenkins/templates/config.yaml b/stable/jenkins/templates/config.yaml index 8d20a8ae08..867d899d97 100644 --- a/stable/jenkins/templates/config.yaml +++ b/stable/jenkins/templates/config.yaml @@ -16,7 +16,11 @@ data: +{{- if .Values.master.imageTag }} {{ .Values.master.imageTag }} +{{- else }} + {{ .Values.master.tag }} +{{- end }} {{ .Values.master.numExecutors }} NORMAL {{ .Values.master.useSecurity }} @@ -68,7 +72,11 @@ data: {{ .Values.agent.sideContainerName }} +{{- if .Values.agent.imageTag }} {{ .Values.agent.image }}:{{ .Values.agent.imageTag }} +{{- else }} + {{ .Values.agent.image }}:{{ .Values.agent.tag }} +{{- end }} {{- if .Values.agent.privileged }} true {{- else }} diff --git a/stable/jenkins/templates/deprecation.yaml b/stable/jenkins/templates/deprecation.yaml index 0dd5b10d3a..adc9201f30 100644 --- a/stable/jenkins/templates/deprecation.yaml +++ b/stable/jenkins/templates/deprecation.yaml @@ -10,7 +10,7 @@ {{- end }} {{- if .Values.Master.ImageTag }} - {{ fail "`Master.ImageTag` does no longer exist. It has been renamed to `master.imageTag`" }} + {{ fail "`Master.ImageTag` does no longer exist. It has been renamed to `master.tag`" }} {{- end }} {{- if .Values.Master.ImagePullPolicy }} diff --git a/stable/jenkins/templates/jenkins-master-deployment.yaml b/stable/jenkins/templates/jenkins-master-deployment.yaml index 61bfe76293..93ccc3b9ca 100644 --- a/stable/jenkins/templates/jenkins-master-deployment.yaml +++ b/stable/jenkins/templates/jenkins-master-deployment.yaml @@ -82,7 +82,11 @@ spec: {{ tpl (toYaml .Values.master.customInitContainers) . | indent 8 }} {{- end }} - name: "copy-default-config" +{{- if .Values.master.imageTag }} image: "{{ .Values.master.image }}:{{ .Values.master.imageTag }}" +{{- else }} + image: "{{ .Values.master.image }}:{{ .Values.master.tag }}" +{{- end }} imagePullPolicy: "{{ .Values.master.imagePullPolicy }}" command: [ "sh", "/var/jenkins_config/apply_config.sh" ] env: @@ -147,7 +151,11 @@ spec: name: secrets-dir containers: - name: {{ template "jenkins.fullname" . }} +{{- if .Values.master.imageTag }} image: "{{ .Values.master.image }}:{{ .Values.master.imageTag }}" +{{- else }} + image: "{{ .Values.master.image }}:{{ .Values.master.tag }}" +{{- end }} imagePullPolicy: "{{ .Values.master.imagePullPolicy }}" {{- if .Values.master.useSecurity }} args: [ "--argumentsRealm.passwd.$(ADMIN_USER)=$(ADMIN_PASSWORD)", "--argumentsRealm.roles.$(ADMIN_USER)=admin"] diff --git a/stable/jenkins/templates/tests/jenkins-test.yaml b/stable/jenkins/templates/tests/jenkins-test.yaml index 621afebe62..51e79c6186 100644 --- a/stable/jenkins/templates/tests/jenkins-test.yaml +++ b/stable/jenkins/templates/tests/jenkins-test.yaml @@ -29,7 +29,11 @@ spec: name: tools containers: - name: {{ .Release.Name }}-ui-test +{{- if .Values.master.imageTag }} image: {{ .Values.master.image }}:{{ .Values.master.imageTag }} +{{- else }} + image: {{ .Values.master.image }}:{{ .Values.master.tag }} +{{- end }} command: ["/tools/bats/bats", "-t", "/tests/run.sh"] volumeMounts: - mountPath: /tests diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index da9861abf2..bc83bbf5c6 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -17,7 +17,7 @@ master: # Used for label app.kubernetes.io/component componentName: "jenkins-master" image: "jenkins/jenkins" - imageTag: "lts" + tag: "lts" imagePullPolicy: "Always" imagePullSecretName: # Optionally configure lifetime for master-container @@ -337,7 +337,7 @@ master: agent: enabled: true image: "jenkins/jnlp-slave" - imageTag: "3.27-1" + tag: "3.27-1" customJenkinsLabels: [] # name of the secret to be used for image pulling imagePullSecretName: