X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fportal%2Ftemplates%2Fportal-apps-deployment.yaml;h=761441acc38b0ae34fb0da9ea6360225eb480bd8;hb=a6eb9be0e091746c824b169a46242ef0943a2b05;hp=75977c7be0ddf8daa8bd2077d0449aaebfe85217;hpb=61468adee9e2c443c336536c29b216209a569478;p=oom.git

diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
index 75977c7be0..761441acc3 100755
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -13,49 +13,31 @@ spec:
        labels:
          app: portalapps
        name: portalapps
-       annotations:
-         pod.beta.kubernetes.io/init-containers: '[
-           {
-               "args": [
-                   "--container-name",
-                   "portaldb"
-               ],
-               "command": [
-                   "/root/ready.py"
-               ],
-               "env": [
-                   {
-                       "name": "NAMESPACE",
-                       "valueFrom": {
-                           "fieldRef": {
-                               "apiVersion": "v1",
-                               "fieldPath": "metadata.namespace"
-                           }
-                       }
-                   }
-               ],
-               "image": "{{ .Values.image.readiness }}",
-               "imagePullPolicy": "{{ .Values.pullPolicy }}",
-               "name": "portalapps-readiness"
-           },
-           {
-               "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -pAa123456 -h portaldb < /portal-mysql/oom_updates.sql; fi"],
-               "volumeMounts": [
-                 {
-                   "mountPath": "/portal-mysql/oom_updates.sql",
-                   "name": "portal-mariadb-onboarding-sql"
-                 },
-                 {
-                   "mountPath": "/portal_root/",
-                   "name": "portal-root"
-                 }
-               ],
-               "image": "{{ .Values.image.mariadbClient }}",
-               "imagePullPolicy": "{{ .Values.pullPolicy }}",
-               "name": "provision-portaldb-users"
-           }
-           ]'
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - portaldb
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: portalapps-readiness
+      - command: ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -pAa123456 -h portaldb < /portal-mysql/oom_updates.sql; fi"]
+        volumeMounts:
+        - mountPath: /portal-mysql/oom_updates.sql
+          name: portal-mariadb-onboarding-sql
+        - mountPath: /portal_root/
+          name: portal-root
+        image: {{ .Values.image.mariadbClient }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: provision-portaldb-users
       containers:
       - image: {{ .Values.image.portalapps }}
         imagePullPolicy: {{ .Values.pullPolicy }}
@@ -160,4 +142,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/logs
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}