From e8f6b0ada2e481789683bab04cdb27ca7c8489be Mon Sep 17 00:00:00 2001 From: Ian Paredes Date: Tue, 23 Apr 2019 02:22:08 -0400 Subject: [PATCH] Fix rendering of customInitContainers and lifecycle for Jenkins helm chart (#13189) Signed-off-by: Ian Paredes --- stable/jenkins/Chart.yaml | 2 +- stable/jenkins/templates/jenkins-master-deployment.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 79ceb04d22..52c05389bf 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,6 +1,6 @@ name: jenkins home: https://jenkins.io/ -version: 1.1.0 +version: 1.1.1 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/templates/jenkins-master-deployment.yaml b/stable/jenkins/templates/jenkins-master-deployment.yaml index 55a5150335..560b203225 100644 --- a/stable/jenkins/templates/jenkins-master-deployment.yaml +++ b/stable/jenkins/templates/jenkins-master-deployment.yaml @@ -77,9 +77,9 @@ spec: {{- toYaml .Values.master.hostAliases | nindent 8 }} {{- end }} initContainers: - {{- if .Values.master.customInitContainers }} - {{ toYaml .Values.master.customInitContainers | indent 8 }} - {{- end }} +{{- if .Values.master.customInitContainers }} +{{ toYaml .Values.master.customInitContainers | indent 8 }} +{{- end }} - name: "copy-default-config" image: "{{ .Values.master.image }}:{{ .Values.master.imageTag }}" imagePullPolicy: "{{ .Values.master.imagePullPolicy }}" @@ -153,7 +153,7 @@ spec: {{- end }} {{- if .Values.master.lifecycle }} lifecycle: - {{ toYaml .Values.master.lifecycle | indent 12 }} +{{ toYaml .Values.master.lifecycle | indent 12 }} {{- end }} env: - name: JAVA_OPTS