From fecc804fc236e26d561711e590a4b5bd0ed55127 Mon Sep 17 00:00:00 2001
From: Dhilip <dhilip.kumar.s@huawei.com>
Date: Wed, 16 Aug 2017 04:57:47 +0530
Subject: [PATCH] promote initContainrs to podspec (#1740)

---
 stable/jenkins/Chart.yaml                     |  2 +-
 .../templates/jenkins-master-deployment.yaml  | 44 ++++++++-----------
 stable/jenkins/templates/jenkins-test.yaml    | 27 ++++++------
 3 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml
index 5be927e603..4c50098496 100755
--- a/stable/jenkins/Chart.yaml
+++ b/stable/jenkins/Chart.yaml
@@ -1,6 +1,6 @@
 name: jenkins
 home: https://jenkins.io/
-version: 0.8.7
+version: 0.8.8
 appVersion: 2.67
 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 projects as well as arbitrary scripts.
 sources:
diff --git a/stable/jenkins/templates/jenkins-master-deployment.yaml b/stable/jenkins/templates/jenkins-master-deployment.yaml
index 159b895998..f05f89e010 100644
--- a/stable/jenkins/templates/jenkins-master-deployment.yaml
+++ b/stable/jenkins/templates/jenkins-master-deployment.yaml
@@ -24,32 +24,6 @@ spec:
         component: "{{ .Release.Name }}-{{ .Values.Master.Component }}"
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
-        pod.alpha.kubernetes.io/init-containers: '[
-              {
-                  "name": "copy-default-config",
-                  "image": "{{ .Values.Master.Image }}:{{ .Values.Master.ImageTag }}",
-                  "imagePullPolicy": "{{ .Values.Master.ImagePullPolicy }}",
-                  "command": [ "sh", "/var/jenkins_config/apply_config.sh" ],
-                  "volumeMounts": [
-                      {
-                          "name": "jenkins-config",
-                          "mountPath": "/var/jenkins_config"
-                      },
-                      {
-                          "name": "jenkins-home",
-                          "mountPath": "/var/jenkins_home"
-                      },
-                      {
-                          "name": "plugin-dir",
-                          "mountPath": "/usr/share/jenkins/ref/plugins/"
-                      },
-                      {
-                          "name": "secrets-dir",
-                          "mountPath": "/usr/share/jenkins/ref/secrets/"
-                      }
-                  ]
-              }
-          ]'
     spec:
       {{- if .Values.Master.NodeSelector }}
       nodeSelector:
@@ -62,6 +36,24 @@ spec:
       securityContext:
         runAsUser: 0
       serviceAccountName: {{ if .Values.rbac.install }}{{ template "fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
+      initContainers:
+        - name: "copy-default-config"
+          image: "{{ .Values.Master.Image }}:{{ .Values.Master.ImageTag }}"
+          imagePullPolicy: "{{ .Values.Master.ImagePullPolicy }}"
+          command: [ "sh", "/var/jenkins_config/apply_config.sh" ]
+          volumeMounts:
+            -
+              mountPath: /var/jenkins_home
+              name: jenkins-home
+            -
+              mountPath: /var/jenkins_config
+              name: jenkins-config
+            -
+              mountPath: /usr/share/jenkins/ref/plugins/
+              name: plugin-dir
+            -
+              mountPath: /usr/share/jenkins/ref/secrets/
+              name: secrets-dir
       containers:
         - name: {{ template "fullname" . }}
           image: "{{ .Values.Master.Image }}:{{ .Values.Master.ImageTag }}"
diff --git a/stable/jenkins/templates/jenkins-test.yaml b/stable/jenkins/templates/jenkins-test.yaml
index 34e9aadff6..2f5d716ee6 100644
--- a/stable/jenkins/templates/jenkins-test.yaml
+++ b/stable/jenkins/templates/jenkins-test.yaml
@@ -4,20 +4,6 @@ metadata:
   name: "{{ .Release.Name }}-ui-test-{{ randAlphaNum 5 | lower }}"
   annotations:
     "helm.sh/hook": test-success
-    "pod.beta.kubernetes.io/init-containers": '[
-      {
-        "name": "test-framework",
-        "image": "dduportal/bats:0.4.0",
-        "command": ["bash", "-c", "
-          set -ex\n
-          # copy bats to tools dir\n
-          cp -R /usr/local/libexec/ /tools/bats/\n
-        "],
-        "volumeMounts": [
-          {"name": "tools", "mountPath": "/tools"}
-        ]
-      }
-    ]'
 spec:
   {{- if .Values.Master.NodeSelector }}
   nodeSelector:
@@ -27,6 +13,19 @@ spec:
   tolerations:
 {{ toYaml .Values.Master.Tolerations | indent 4 }}
   {{- end }}
+  initContainers:
+    - name: "test-framework"
+      image: "dduportal/bats:0.4.0"
+      command:
+      - "bash"
+      - "-c"
+      - |
+        set -ex
+        # copy bats to tools dir
+        cp -R /usr/local/libexec/ /tools/bats/
+      volumeMounts:
+      - mountPath: /tools
+        name: tools
   containers:
     - name: {{ .Release.Name }}-ui-test
       image: {{ .Values.Master.Image }}:{{ .Values.Master.ImageTag }}