WIP: Upgrade deployments, start upgrade init-containers

portal/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 description: PhenoMeNal Portal
 name: portal
-version: 2.3.1
+version: 2.4.0

portal/templates/app-lib-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Release.Name }}-app-library

portal/templates/frontend-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Values.frontend.name }}
@@ -9,19 +9,14 @@ spec:
       labels:
         app: {{ .Values.frontend.name }}
       annotations:
-        pod.beta.kubernetes.io/init-containers: |-
-          [
-            {
-              "name": "metadata-listener",
-              "image": "alpine",
-              "imagePullPolicy": "IfNotPresent",
-              "command": [
-                "sh", "-c",
-                "for i in $(seq 1 200); do nc -z -w3 {{ .Release.Name }}-metadata 8888 && exit 0 || sleep 3; done; exit 1"
-              ]
-            }
-          ]
     spec:
+      initContainers:
+      - name: metadata-listener
+        image: alpine
+        command: 
+          - sh
+          - -c
+          - for i in $(seq 1 200); do nc -z -w3 {{ .Release.Name }}-metadata 8888 && exit 0 || sleep 3; done; exit 1
       containers:
       - name: {{ .Chart.Name }}
         image: '{{ .Values.frontend.image.repository }}:{{ .Values.frontend.image.tag }}'

portal/templates/metadata-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Release.Name }}-metadata
@@ -8,20 +8,14 @@ spec:
     metadata:
       labels:
          app: {{ .Release.Name }}-metadata
-      annotations:
-        pod.beta.kubernetes.io/init-containers: |-
-          [
-            {
-              "name": "mysql-listener",
-              "image": "alpine",
-              "imagePullPolicy": "IfNotPresent",
-              "command": [
-                "sh", "-c",
-                "for i in $(seq 1 200); do nc -z -w3 {{ .Release.Name }}-mysql 3306 && exit 0 || sleep 3; done; exit 1"
-              ]
-            }
-          ]
     spec:
+      initContainers:
+      - name: mysql-listener
+        image: alpine
+        command: 
+        - sh
+        - -c
+        - for i in $(seq 1 200); do nc -z -w3 {{ .Release.Name }}-metadata 8888 && exit 0 || sleep 3; done; exit 1
       containers:
       - name: metadata
         image: '{{ .Values.metadata.image.repository }}:{{ .Values.metadata.image.tag }}'

portal/templates/wiki-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Release.Name }}-wiki