Merge "Update annotations to spec for vid"

[oom.git] / kubernetes / vid / templates / vid-server-deployment.yaml

diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index e8c7f55..832fdeb 100644 (file)
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -15,33 +15,22 @@ spec:
       labels:
         app: vid-server
       name: vid-server
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "vid-mariadb"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "vid-server-readiness"
-          }
-          ]'
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - vid-mariadb
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: vid-server-readiness
       containers:
       - env:
         - name: ASDC_CLIENT_REST_HOST
@@ -55,19 +44,19 @@ spec:
         - name: VID_AAI_PORT
           value: "8443"
         - name: VID_ECOMP_SHARED_CONTEXT_REST_URL
-          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/context
+          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/context
         - name: VID_MSO_SERVER_URL
           value: http://mso.{{ .Values.nsPrefix }}-mso:8080
         - name: VID_MSO_PASS
-          value: 51515201a8d4c5c08d533db9bd1e1a9b
+          value: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
         - name: MSO_DME2_SERVER_URL
           value: http://localhost:8081
         - name: MSO_DME2_ENABLED
           value: "false"
         - name: VID_ECOMP_REDIRECT_URL
-          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/login.htm
+          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/login.htm
         - name: VID_ECOMP_REST_URL
-          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/auxapi
+          value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/auxapi
         - name: VID_CONTACT_US_LINK
           value: https://todo_contact_us_link.com
         - name: VID_UEB_URL_LIST
@@ -132,4 +121,4 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/vid/logback.xml
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}