From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Fri, 15 Dec 2017 15:44:35 +0000 (+0000)
Subject: Merge "Update annotations to spec for clamp"
X-Git-Tag: 2.0.0-ONAP~536
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=43d085b521d5be0df7ecfd39215b24cae3a140fd;hp=-c;p=oom.git

Merge "Update annotations to spec for clamp"
---

43d085b521d5be0df7ecfd39215b24cae3a140fd
diff --combined kubernetes/clamp/templates/clamp-deployment.yaml
index 61091a87f3,0f3913ce91..de9adaca81
--- a/kubernetes/clamp/templates/clamp-deployment.yaml
+++ b/kubernetes/clamp/templates/clamp-deployment.yaml
@@@ -15,40 -15,28 +15,29 @@@ spec
        labels:
          app: clamp
        name: clamp
-       annotations:
-         pod.beta.kubernetes.io/init-containers: '[
-           {
-               "args": [
-                   "--container-name",
-                   "clamp-mariadb"
-               ],
-               "command": [
-                   "/root/ready.py"
-               ],
-               "env": [
-                   {
-                       "name": "NAMESPACE",
-                       "valueFrom": {
-                           "fieldRef": {
-                               "apiVersion": "v1",
-                               "fieldPath": "metadata.namespace"
-                           }
-                       }
-                   }
-               ],
-               "image": "{{ .Values.image.readiness }}",
-               "imagePullPolicy": "{{ .Values.pullPolicy }}",
-               "name": "clamp-readiness"
-           }
-           ]'
      spec:
+       initContainers:
+       - command:
+         - /root/ready.py
+         args:
+         - --container-name
+         - clamp-mariadb
+         env:
+         - name: NAMESPACE
+           valueFrom:
+             fieldRef:
+               apiVersion: v1
+               fieldPath: metadata.namespace
+         image: {{ .Values.image.readiness }}
+         imagePullPolicy: {{ .Values.pullPolicy }}
+         name: clamp-readiness
        containers:
        - env:
          - name: SPRING_APPLICATION_JSON
 -          value: '{"spring.datasource.camunda.url":"jdbc:mysql://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&maxReconnects=100","spring.datasource.camunda.username":
 -            "root","spring.datasource.camunda.password": "{{ .Values.mysqlPassword }}", "spring.datasource.cldsdb.url":"jdbc:mysql://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&maxReconnects=100","spring.datasource.cldsdb.username":
 -            "root", "spring.datasource.cldsdb.password": "{{ .Values.mysqlPassword }}"}'
 +          value: '{
 +  "spring.datasource.camunda.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647",
 +  "spring.datasource.cldsdb.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647"
 +  }'
          image: {{ .Values.image.clampImage }}:{{ .Values.image.clampVersion }}
          imagePullPolicy: {{ .Values.pullPolicy }}
          name: clamp
@@@ -59,4 -47,4 +48,4 @@@
            periodSeconds: 10
        imagePullSecrets:
        - name: {{ .Values.nsPrefix }}-docker-registry-key
- #{{ end }}
+ #{{ end }}