sdc K8S-Helm Parameterization

changed sdc k8s deployment to support helm parameterization. updated create/delete for helm only
Issue-ID: OOM-52
Change-Id: Ic7fb17fcf5be5813b0a0c54299cdf0d0417e8a76
Signed-off-by: kerenj <keren.joseph@amdocs.com>

8 files changed, 60 insertions, 32 deletions

diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml
new file mode 100644
index 0000000000..668a9a641e
--- /dev/null
+++ b/kubernetes/sdc/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: sdc
+version: 0.1.0
diff --git a/kubernetes/sdc/all-services.yaml b/kubernetes/sdc/templates/all-services.yaml
index 1d832f0c4f..25ca65e0da 100644
--- a/kubernetes/sdc/all-services.yaml
+++ b/kubernetes/sdc/templates/all-services.yaml
@@ -4,6 +4,7 @@ metadata:
   labels:
     app: sdc-es
   name: sdc-es
+  namespace: {{ .Values.NS }}
 spec:
   ports:
   - name: sdc-es-port-9200
@@ -20,6 +21,7 @@ metadata:
   labels:
     app: sdc-cs
   name: sdc-cs
+  namespace: {{ .Values.NS }}
 spec:
   ports:
   - name: sdc-cs-port-9042
@@ -36,6 +38,7 @@ metadata:
   labels:
     app: sdc-kb
   name: sdc-kb
+  namespace: {{ .Values.NS }}
 spec:
   ports:
   - name: sdc-kb-port-5601
@@ -50,6 +53,7 @@ metadata:
   labels:
     app: sdc-be
   name: sdc-be
+  namespace: {{ .Values.NS }}
 spec:
   ports:
   - name: sdc-be-port-8443
@@ -68,6 +72,7 @@ metadata:
   labels:
     app: sdc-fe
   name: sdc-fe
+  namespace: {{ .Values.NS }}
 spec:
   ports:
   - name: sdc-fe-port-9443
diff --git a/kubernetes/sdc/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml
index ac2378cb60..96fee818da 100644
--- a/kubernetes/sdc/sdc-be.yaml
+++ b/kubernetes/sdc/templates/sdc-be.yaml
@@ -4,6 +4,7 @@ metadata:
   labels:
     app: sdc-be
   name: sdc-be
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -38,8 +39,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "sdc-be-readiness"
           },
           {
@@ -56,8 +57,8 @@ spec:
                       "value": "onap-message-router"
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "sdc-dmaap-readiness"
           }
           ]'
@@ -70,7 +71,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: nexus3.onap.org:10001/openecomp/sdc-backend:1.1-STAGING-latest
+        image: {{ .Values.image.sdcBackend }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: sdc-be
         volumeMounts:
         - mountPath: /usr/share/elasticsearch/data/
@@ -94,18 +96,18 @@ spec:
       volumes:
         - name: sdc-sdc-es-es
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/sdc-es/ES
+            path: /dockerdata-nfs/onap/sdc/sdc-es/ES
         - name: sdc-environments
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/environments
+            path: /dockerdata-nfs/onap/sdc/environments
         - name: sdc-jetty-keystore
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/jetty/keystore
+            path: /dockerdata-nfs/onap/sdc/jetty/keystore
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime
         - name:  sdc-logs
           hostPath:
-            path:  /dockerdata-nfs/onapdemo/sdc/logs
+            path:  /dockerdata-nfs/onap/sdc/logs
       imagePullSecrets:
       - name: onap-docker-registry-key
diff --git a/kubernetes/sdc/sdc-cs.yaml b/kubernetes/sdc/templates/sdc-cs.yaml
index 081bae459d..55a5613609 100644
--- a/kubernetes/sdc/sdc-cs.yaml
+++ b/kubernetes/sdc/templates/sdc-cs.yaml
@@ -4,6 +4,7 @@ metadata:
   labels:
     app: sdc-cs
   name: sdc-cs
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -34,8 +35,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "sdc-cs-readiness"
           }
           ]'
@@ -50,7 +51,8 @@ spec:
               fieldPath: status.podIP
         - name: ES_HEAP_SIZE
           value: "1024M"
-        image: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.1-STAGING-latest
+        image: {{ .Values.image.sdcCassandra }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: sdc-cs
         volumeMounts:
         - mountPath: /var/lib/cassandra/
@@ -72,15 +74,15 @@ spec:
       volumes:
         - name: sdc-sdc-cs-cs
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/sdc-cs/CS
+            path: /dockerdata-nfs/onap/sdc/sdc-cs/CS
         - name: sdc-environments
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/environments
+            path: /dockerdata-nfs/onap/sdc/environments
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime
         - name:  sdc-logs
           hostPath:
-            path:  /dockerdata-nfs/onapdemo/sdc/logs
+            path:  /dockerdata-nfs/onap/sdc/logs
       imagePullSecrets:
       - name: onap-docker-registry-key
diff --git a/kubernetes/sdc/sdc-es.yaml b/kubernetes/sdc/templates/sdc-es.yaml
index cfb5242141..f1dfb43f0b 100644
--- a/kubernetes/sdc/sdc-es.yaml
+++ b/kubernetes/sdc/templates/sdc-es.yaml
@@ -4,6 +4,7 @@ metadata:
   labels:
     app: sdc-es
   name: sdc-es
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -15,7 +16,8 @@ spec:
       name: sdc-es
     spec:
       containers:
-      - image: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.1-STAGING-latest
+      - image: {{ .Values.image.sdcElasticsearch }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: sdc-es
         env:
         - name: ENVNAME
@@ -46,15 +48,15 @@ spec:
       volumes:
         - name: sdc-sdc-es-es
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/sdc-es/ES
+            path: /dockerdata-nfs/onap/sdc/sdc-es/ES
         - name: sdc-environments
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/environments
+            path: /dockerdata-nfs/onap/sdc/environments
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime
         - name:  sdc-logs
           hostPath:
-            path:  /dockerdata-nfs/onapdemo/sdc/logs
+            path:  /dockerdata-nfs/onap/sdc/logs
       imagePullSecrets:
       - name: onap-docker-registry-key
diff --git a/kubernetes/sdc/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml
index 0711aa9dfd..a566b15a02 100644
--- a/kubernetes/sdc/sdc-fe.yaml
+++ b/kubernetes/sdc/templates/sdc-fe.yaml
@@ -4,6 +4,7 @@ metadata:
   labels:
     app: sdc-fe
   name: sdc-fe
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -40,8 +41,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "sdc-fe-readiness"
           }
           ]'
@@ -55,7 +56,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: nexus3.onap.org:10001/openecomp/sdc-frontend:1.1-STAGING-latest
+        image: {{ .Values.image.sdcFrontend }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         volumeMounts:
         - mountPath: /usr/share/elasticsearch/data/
           name: sdc-sdc-es-es
@@ -80,21 +82,21 @@ spec:
       volumes:
         - name: sdc-sdc-es-es
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/sdc-es/ES
+            path: /dockerdata-nfs/onap/sdc/sdc-es/ES
         - name: sdc-environments
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/environments
+            path: /dockerdata-nfs/onap/sdc/environments
         - name: sdc-jetty-keystore
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/jetty/keystore
+            path: /dockerdata-nfs/onap/sdc/jetty/keystore
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime
         - name:  sdc-logs
           hostPath:
-            path:  /dockerdata-nfs/onapdemo/sdc/logs
+            path:  /dockerdata-nfs/onap/sdc/logs
         - name:  sdc-fe-config
           hostPath:
-            path:  /dockerdata-nfs/onapdemo/sdc/sdc-fe/FE_2_setup_configuration.rb
+            path:  /dockerdata-nfs/onap/sdc/sdc-fe/FE_2_setup_configuration.rb
       imagePullSecrets:
       - name: onap-docker-registry-key
diff --git a/kubernetes/sdc/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml
index 83483f7af3..0dca7e45a2 100644
--- a/kubernetes/sdc/sdc-kb.yaml
+++ b/kubernetes/sdc/templates/sdc-kb.yaml
@@ -4,6 +4,7 @@ metadata:
   labels:
     app: sdc-kb
   name: sdc-kb
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -36,8 +37,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "sdc-kb-readiness"
           }
           ]'
@@ -48,7 +49,8 @@ spec:
           value: AUTO
         - name: ELASTICSEARCH_URL
           value: http://sdc-es:9200
-        image: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest
+        image: {{ .Values.image.sdcKibana }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: sdc-kb
         volumeMounts:
         - mountPath: /root/chef-solo/environments/
@@ -67,12 +69,12 @@ spec:
       volumes:
         - name: sdc-environments
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/environments
+            path: /dockerdata-nfs/onap/sdc/environments
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime
         - name:  sdc-logs
           hostPath:
-            path:  /dockerdata-nfs/onapdemo/sdc/logs
+            path:  /dockerdata-nfs/onap/sdc/logs
       imagePullSecrets:
       - name: onap-docker-registry-key
diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml
new file mode 100644
index 0000000000..066f0d0afb
--- /dev/null
+++ b/kubernetes/sdc/values.yaml
@@ -0,0 +1,9 @@
+NS: onap-sdc
+pullPolicy: Always
+image:
+  readiness: oomk8s/readiness-check:1.0.0
+  sdcKibana: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest
+  sdcFrontend: nexus3.onap.org:10001/openecomp/sdc-frontend:1.1-STAGING-latest
+  sdcElasticsearch: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.1-STAGING-latest
+  sdcCassandra: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.1-STAGING-latest
+  sdcBackend: nexus3.onap.org:10001/openecomp/sdc-backend:1.1-STAGING-latest