Add K8S deployment above Vagrant

Set deployment manifest files and scripts
for deploy SDC over Kubernetes inside
Vagrant
Preparation for OOM integration

Change-Id: If5d6b4131b75eb4795ce8bfd8ec228808938d40e
Issue-ID: SDC-907
Signed-off-by: Areli Fuss <af732p@att.com>

9 files changed, 69 insertions, 64 deletions

diff --git a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-be.yaml b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-be.yaml
index ab293c2444..7c3a91c350 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-be.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-be.yaml
@@ -18,17 +18,14 @@ spec:
       app: sdc-be
   template:
     metadata:
-      annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/configmaps/sdc-environment-configmap.yaml") . | sha256sum }}
-        checksum/config: {{ include (print $.Template.BasePath "/configmaps/sdc-check-job-completion.yaml") . | sha256sum }}
       labels:
         app: sdc-be
       name: sdc-be
     spec:
       initContainers:
       - name: sdc-be-readiness
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: "{{ .Values.image.readiness }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
         command:
         - /root/ready.py
         args:
@@ -45,8 +42,8 @@ spec:
               apiVersion: v1
               fieldPath: metadata.namespace
       - name: sdc-job-completion
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: "{{ .Values.image.readiness }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
         command:
         - python
         args:
@@ -64,8 +61,8 @@ spec:
           name: sdc-check-job-completion
       containers:
       - name: sdc-be
-        image: {{ .Values.image.sdcBackend }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: "{{ .Values.image.sdcBackend }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
         ports:
         - containerPort: 8443
         - containerPort: 8080
@@ -85,7 +82,7 @@ spec:
           name: sdc-logback
         env:
         - name: ENVNAME
-          value: AUTO
+          value: "{{ .Values.env.name }}"
         - name: HOST_IP
           valueFrom:
             fieldRef:
@@ -97,8 +94,9 @@ spec:
         readinessProbe:
           tcpSocket:
             port: 8443
-          initialDelaySeconds: 5
+          initialDelaySeconds: 120
           periodSeconds: 10
+          failureThreshold: 30
       volumes:
         - name: filebeat-conf
           hostPath:
diff --git a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml
index 64d18370e8..906b7c6663 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml
@@ -28,22 +28,23 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: "{{ .Values.image.readiness }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
         name: sdc-cs-readiness
       containers:
       - name: sdc-cs
-        image: {{ .Values.image.sdcCassandra }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: "{{ .Values.image.sdcCassandra }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
+        # run cs & wait forever
+        command: ["/root/startup.sh"]
+        args: [ "/bin/sh", "-c" , "while true; do sleep 30; done;" ]
         env:
         - name: ENVNAME
-          value: AUTO
+          value: "{{ .Values.env.name }}"
         - name: HOST_IP
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        - name: ES_HEAP_SIZE
-          value: "1024M"
         - name: CS_PASSWORD
           valueFrom:
             secretKeyRef: {name: sdc-cs-secret, key: cs_password}
@@ -63,10 +64,8 @@ spec:
         readinessProbe:
           exec:
             command:
-            - /bin/sh
-            - -c
-            - /var/lib/ready/probe.sh
-          initialDelaySeconds: 30
+            - "/var/lib/ready-probe.sh"
+          initialDelaySeconds: 60
           periodSeconds: 10
       volumes:
       - name: sdc-sdc-cs-cs
diff --git a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-es.yaml b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-es.yaml
index d673e40d2e..5ab7fee83e 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-es.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-es.yaml
@@ -17,12 +17,16 @@ spec:
       name: sdc-es
     spec:
       containers:
-      - image: {{ .Values.image.sdcElasticsearch }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: sdc-es
+      - name: sdc-es
+        image: "{{ .Values.image.sdcElasticsearch }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
+        # run & wait forever
+        command: ["/root/startup.sh"]
+        args: [ "/bin/sh", "-c" , "while true; do sleep 30; done;" ]
+        
         env:
         - name: ENVNAME
-          value: "AUTO"
+          value: "{{ .Values.env.name }}"
         - name: HOST_IP
           valueFrom:
             fieldRef:
diff --git a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-fe.yaml b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-fe.yaml
index c21efdcb8f..49f5bb38c7 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-fe.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-fe.yaml
@@ -17,7 +17,8 @@ spec:
       name: sdc-fe
     spec:
       initContainers:
-      - command:
+      - name: sdc-fe-readiness
+        command:
         - /root/ready.py
         args:
         - --container-name
@@ -34,9 +35,8 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: sdc-fe-readiness
+        image: "{{ .Values.image.readiness }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
       volumes:
 #        - name: filebeat-conf
 #          hostPath:
@@ -67,15 +67,15 @@ spec:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
       containers:
       - name: sdc-fe
+        image: "{{ .Values.image.sdcFrontend }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
         env:
         - name: ENVNAME
-          value: AUTO
+          value: "{{ .Values.env.name }}"
         - name: HOST_IP
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: {{ .Values.image.sdcFrontend }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
         volumeMounts:
 #        - mountPath: /usr/share/elasticsearch/data/
 #          name: sdc-sdc-es-es
@@ -92,16 +92,16 @@ spec:
 #          name: sdc-fe-config
 #        - mountPath: /tmp/logback.xml
 #          name: sdc-logback
-        lifecycle:
-          postStart:
-            exec:
-              command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/var/lib/jetty/config/catalog-fe/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
+#        lifecycle:
+#          postStart:
+#            exec:
+#              command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/var/lib/jetty/config/catalog-fe/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
         ports:
         - containerPort: 9443
         - containerPort: 8181
         readinessProbe:
           tcpSocket:
             port: 8181
-          initialDelaySeconds: 5
+          initialDelaySeconds: 30
           periodSeconds: 10
 #{{ end }}
diff --git a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-kb.yaml b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-kb.yaml
index 5c7f4a4614..30b1be63a5 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-kb.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-kb.yaml
@@ -30,17 +30,17 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: "{{ .Values.image.readiness }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
         name: sdc-kb-readiness
       containers:
       - env:
         - name: ENVNAME
-          value: AUTO
+          value: "{{ .Values.env.name }}"
         - name: ELASTICSEARCH_URL
           value: http://sdc-es:9200
-        image: {{ .Values.image.sdcKibana }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: "{{ .Values.image.sdcKibana }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
         name: sdc-kb
         volumeMounts:
         - mountPath: /root/chef-solo/environments/
diff --git a/sdc-os-chef/kubernetes/sdc/templates/jobs/sdc-config-cs.yaml b/sdc-os-chef/kubernetes/sdc/templates/jobs/sdc-config-cs.yaml
index e371b43377..722f104452 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/jobs/sdc-config-cs.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/jobs/sdc-config-cs.yaml
@@ -13,8 +13,8 @@ spec:
     spec:
       initContainers:
       - name: sdc-init-cs-readiness
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: "{{ .Values.image.readiness }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
         command:
         - /root/ready.py
         args:
@@ -28,22 +28,23 @@ spec:
               fieldPath: metadata.namespace
       containers:
       - name: sdc-config-cs
-        image: {{ .Values.image.sdcCassandraInit }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        ports:
-        - containerPort: 8080
+        image: "{{ .Values.image.sdcCassandraInit }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
         volumeMounts:
         - mountPath: /root/chef-solo/environments/
           name: sdc-environments
         env:
         - name: ENVNAME
-          value: "AUTO"
+          value: "{{ .Values.env.name }}"
         - name: SDC_USER
           valueFrom:
             secretKeyRef: {name: sdc-cs-secret, key: sdc_user}
         - name: SDC_PASSWORD
           valueFrom:
             secretKeyRef: {name: sdc-cs-secret, key: sdc_password}
+        - name: CS_PASSWORD
+          valueFrom:
+            secretKeyRef: {name: sdc-cs-secret, key: cs_password}
       volumes:
         - name: sdc-environments
           configMap:
diff --git a/sdc-os-chef/kubernetes/sdc/templates/jobs/sdc-config-es.yaml b/sdc-os-chef/kubernetes/sdc/templates/jobs/sdc-config-es.yaml
index e0f6466636..6aec759368 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/jobs/sdc-config-es.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/jobs/sdc-config-es.yaml
@@ -13,8 +13,8 @@ spec:
     spec:
       initContainers:
       - name: sdc-init-es-readiness
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        image: "{{ .Values.image.readiness }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
         command:
         - /root/ready.py
         args:
@@ -28,16 +28,14 @@ spec:
               fieldPath: metadata.namespace
       containers:
       - name: sdc-config-es
-        image: {{ .Values.image.sdcElasticsearchInit }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        ports:
-        - containerPort: 8080
+        image: "{{ .Values.image.sdcElasticsearchInit }}"
+        imagePullPolicy: "{{ .Values.pullPolicy }}"
         volumeMounts:
         - mountPath: /root/chef-solo/environments/
           name: sdc-environments
         env:
         - name: ENVNAME
-          value: "AUTO"
+          value: "{{ .Values.env.name }}"
       volumes:
         - name: sdc-environments
           configMap:
diff --git a/sdc-os-chef/kubernetes/sdc/templates/secrets/sdc-cs-secret.yaml b/sdc-os-chef/kubernetes/sdc/templates/secrets/sdc-cs-secret.yaml
index 2e63c60538..ce1907f80b 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/secrets/sdc-cs-secret.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/secrets/sdc-cs-secret.yaml
@@ -7,8 +7,8 @@ metadata:
 type: Opaque
 data:
     #application user
-    sdc_user: YXNkY191c2Vy
-    sdc_password: QWExMjM0JV4h
+    sdc_user: "{{ .Values.secrets.sdc_user }}"
+    sdc_password: "{{ .Values.secrets.sdc_password }}"
     #default user:
-    cs_password: b25hcDEyMyNAIQ==
+    cs_password: "{{ .Values.secrets.cs_password }}"
     
diff --git a/sdc-os-chef/kubernetes/sdc/values.yaml b/sdc-os-chef/kubernetes/sdc/values.yaml
index a6950b262b..61aaa9a781 100644
--- a/sdc-os-chef/kubernetes/sdc/values.yaml
+++ b/sdc-os-chef/kubernetes/sdc/values.yaml
@@ -5,11 +5,11 @@ image:
   readiness: oomk8s/readiness-check:1.0.0
   sdcKibana: nexus3.onap.org:10001/onap/sdc-kibana:1.2-STAGING-latest
   sdcFrontend: nexus3.onap.org:10001/onap/sdc-frontend:1.2-STAGING-latest
-  sdcElasticsearch: nexus3.onap.org:10001/onap/sdc-elasticsearch:1.2.0-STAGING-latest
-  sdcCassandra: nexus3.onap.org:10001/onap/sdc-cassandra:1.2.0-STAGING-latest
+  sdcElasticsearch: nexus3.onap.org:10001/onap/sdc-elasticsearch:1.2-STAGING-latest
+  sdcCassandra: nexus3.onap.org:10001/onap/sdc-cassandra:1.2-STAGING-latest
   sdcBackend: nexus3.onap.org:10001/onap/sdc-backend:1.2-STAGING-latest
   sdcElasticsearchInit: nexus3.onap.org:10001/onap/sdc-init-elasticsearch:1.2-STAGING-latest
-  sdcCassandraInit: vulpe03/cqlsh
+  sdcCassandraInit: nexus3.onap.org:10001/onap/sdc-cassandra-init:1.2-STAGING-latest
   filebeat: docker.elastic.co/beats/filebeat:5.5.0
 
 env:
@@ -18,4 +18,9 @@ env:
   nodeCS: sdc-cs.onap-sdc
   nodeES: sdc-es.onap-sdc
   nodeBE: sdc-be.onap-sdc
-  nodeFe: sdc-fe.onap-sdc
\ No newline at end of file
+  nodeFe: sdc-fe.onap-sdc
+
+secrets:
+    sdc_user: YXNkY191c2Vy
+    sdc_password: QWExMjM0JV4h
+    cs_password: b25hcDEyMyNAIQ==
\ No newline at end of file