[stable/artifactory]Promote initContainers to pod spec (#1736)

* Promote initContainers to pod spec

* Fix typo

* Fix version and consistent intendation

stable/artifactory/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 name: artifactory
 home: https://www.jfrog.com/artifactory/
-version: 5.4.5
-appVersion: 5.4.5
+version: 5.4.6-1
+appVersion: 5.4.6
 description: Universal Repository Manager supporting all major packaging formats, build tools and CI servers.
 keywords:
 - artifactory

stable/artifactory/README.md

@@ -2,6 +2,7 @@
 
 ## Prerequisites Details
 
+* Kubernetes 1.6+
 * Artifactory Pro trial license [get one from here](https://www.jfrog.com/artifactory/free-trial/)
 
 ## Chart Details

stable/artifactory/templates/artifactory-deployment.yaml

@@ -16,18 +16,18 @@ spec:
         app: {{ template "name" . }}
         component: "{{ .Values.artifactory.name }}"
         release: {{ .Release.Name }}
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[{
-          "name": "remove-lost-found",
-          "image": {{ .Values.initContainerImage | quote }},
-          "command": ["rm", "-rf", "{{ .Values.artifactory.persistence.mountPath }}/lost+found"],
-          "volumeMounts": [{
-              "name": "artifactory-volume",
-              "mountPath": {{ .Values.artifactory.persistence.mountPath | quote }}
-            }],
-          "imagePullPolicy": {{ .Values.artifactory.image.pullPolicy | quote }}
-        }]'
     spec:
+      initContainers:
+      - name: "remove-lost-found"
+        image: "{{ .Values.initContainerImage }}"
+        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+        command:
+        - "rm"
+        - "-rf"
+        - "{{ .Values.artifactory.persistence.mountPath }}/lost+found"
+        volumeMounts:
+        - mountPath: {{ .Values.artifactory.persistence.mountPath | quote }}
+          name: artifactory-volume
       containers:
       - name: {{ .Values.artifactory.name }}
         image: "{{ .Values.artifactory.image.repository }}:{{ .Values.artifactory.image.version }}"
@@ -56,4 +56,4 @@ spec:
           claimName: {{ template "artifactory.fullname" . }}
       {{- else }}
         emptyDir: {}
-      {{- end -}}
+      {{- end -}}

stable/artifactory/templates/nginx-deployment.yaml

@@ -16,18 +16,18 @@ spec:
         app: {{ template "name" . }}
         component: "{{ .Values.nginx.name }}"
         release: {{ .Release.Name }}
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[{
-          "name": "remove-lost-found",
-          "image": {{ .Values.initContainerImage | quote }},
-          "command": ["rm", "-rf", "{{ .Values.nginx.persistence.mountPath }}/lost+found"],
-          "volumeMounts": [{
-              "name": "nginx-volume",
-              "mountPath": {{ .Values.nginx.persistence.mountPath | quote }}
-            }],
-          "imagePullPolicy": {{ .Values.nginx.image.pullPolicy | quote }}
-        }]'
     spec:
+      initContainers:
+      - name: "remove-lost-found"
+        image: "{{ .Values.initContainerImage }}"
+        imagePullPolicy: {{ .Values.nginx.image.pullPolicy }}
+        command:
+        - "rm"
+        - "-rf"
+        - "{{ .Values.nginx.persistence.mountPath }}/lost+found"
+        volumeMounts:
+        - mountPath: {{ .Values.nginx.persistence.mountPath | quote }}
+          name: nginx-volume
       containers:
       - name: {{ .Values.nginx.name }}
         image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.version }}"
@@ -50,4 +50,4 @@ spec:
           claimName: {{ template "nginx.fullname" . }}
       {{- else }}
         emptyDir: {}
-      {{- end -}}
+      {{- end -}}

stable/artifactory/templates/postgresql-deployment.yaml

@@ -16,18 +16,18 @@ spec:
         app: {{ template "name" . }}
         component: "{{ .Values.database.name }}"
         release: {{ .Release.Name }}
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[{
-          "name": "remove-lost-found",
-          "image": {{ .Values.initContainerImage | quote }},
-          "command": ["rm", "-rf", "{{ .Values.database.persistence.mountPath }}/lost+found"],
-          "volumeMounts": [{
-              "name": "postgresql-volume",
-              "mountPath": {{ .Values.database.persistence.mountPath | quote }}
-            }],
-          "imagePullPolicy": {{ .Values.database.image.pullPolicy | quote }}
-        }]'
     spec:
+      initContainers:
+      - name: "remove-lost-found"
+        image: "{{ .Values.initContainerImage }}"
+        imagePullPolicy: "{{ .Values.database.image.pullPolicy }}"
+        command:
+        - "rm"
+        - "-rf"
+        - "{{ .Values.database.persistence.mountPath }}/lost+found"
+        volumeMounts:
+        - mountPath: {{ .Values.database.persistence.mountPath | quote }}
+          name: postgresql-volume
       containers:
       - name: {{ .Values.database.name }}
         image: "{{ .Values.database.image.repository }}:{{ .Values.database.image.version }}"
@@ -54,4 +54,4 @@ spec:
           claimName: {{ template "database.fullname" . }}
       {{- else }}
         emptyDir: {}
-      {{- end -}}
+      {{- end -}}

stable/artifactory/values.yaml

@@ -37,7 +37,7 @@ artifactory:
   image:
     #repository: "docker.bintray.io/jfrog/artifactory-oss"
     repository: "docker.bintray.io/jfrog/artifactory-pro"
-    version: 5.4.5
+    version: 5.4.6
     pullPolicy: IfNotPresent
   service:
     type: ClusterIP
@@ -55,7 +55,7 @@ nginx:
   replicaCount: 1
   image:
     repository: "docker.bintray.io/jfrog/nginx-artifactory-pro"
-    version: 5.4.5
+    version: 5.4.6
     pullPolicy: IfNotPresent
   service:
     ## For minikube, set this to NodePort, elsewhere use LoadBalancer
@@ -71,4 +71,4 @@ nginx:
     mountPath: "/var/opt/jfrog/nginx"
     enabled: true
     accessMode: ReadWriteOnce
-    size: 5Gi
+    size: 5Gi