From fc2caa6c458c77e10e738a8e9af058d222ac9405 Mon Sep 17 00:00:00 2001
From: kerenj <keren.joseph@amdocs.com>
Date: Wed, 23 Aug 2017 12:46:02 +0000
Subject: [PATCH] robot K8S-Helm Parameterization

changed robot k8s deployment to support helm parameterization. updated image to 1.1
Issue-ID: OOM-52
Change-Id: Ibd7cd5a73589abb42940897a5a524cb44f53dd98
Signed-off-by: kerenj <keren.joseph@amdocs.com>
---
 kubernetes/oneclick/setenv.bash                        |  4 ++--
 kubernetes/robot/Chart.yaml                            |  4 ++++
 kubernetes/robot/templates/all-services.yaml           | 14 ++++++++++++++
 kubernetes/robot/{ => templates}/robot-deployment.yaml | 14 ++++++++------
 kubernetes/robot/values.yaml                           |  5 +++++
 5 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 kubernetes/robot/Chart.yaml
 create mode 100644 kubernetes/robot/templates/all-services.yaml
 rename kubernetes/robot/{ => templates}/robot-deployment.yaml (74%)
 create mode 100644 kubernetes/robot/values.yaml

diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash
index 384005bde7..9b4de9ddce 100644
--- a/kubernetes/oneclick/setenv.bash
+++ b/kubernetes/oneclick/setenv.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-HELM_APPS=('mso' 'message-router' 'sdnc' 'vid')
-ONAP_APPS=('sdc' 'aai' 'robot' 'portal' 'policy' 'appc')
+HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot')
+ONAP_APPS=('sdc' 'aai' 'portal' 'policy' 'appc')
 ONAP_DOCKER_REGISTRY_KEY=${ONAP_DOCKER_REGISTRY_KEY:-onap-docker-registry-key}
 ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001}
 ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker}
diff --git a/kubernetes/robot/Chart.yaml b/kubernetes/robot/Chart.yaml
new file mode 100644
index 0000000000..1f59785ede
--- /dev/null
+++ b/kubernetes/robot/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: robot
+version: 0.1.0
diff --git a/kubernetes/robot/templates/all-services.yaml b/kubernetes/robot/templates/all-services.yaml
new file mode 100644
index 0000000000..2b80a29c83
--- /dev/null
+++ b/kubernetes/robot/templates/all-services.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: robot
+  name: robot
+  namespace: {{ .Values.NS }}
+spec:
+  ports:
+  - port: 88
+    nodePort: 30209
+  selector:
+    app: robot
+  type: NodePort
diff --git a/kubernetes/robot/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml
similarity index 74%
rename from kubernetes/robot/robot-deployment.yaml
rename to kubernetes/robot/templates/robot-deployment.yaml
index ade71472fa..c4bc9544d8 100644
--- a/kubernetes/robot/robot-deployment.yaml
+++ b/kubernetes/robot/templates/robot-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: robot
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -13,7 +14,8 @@ spec:
        name: robot
     spec:
       containers:
-      - image: nexus3.onap.org:10001/openecomp/testsuite:1.0-STAGING-latest
+      - image: {{ .Values.image.testsuite }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         name: robot
         volumeMounts:
         - name: robot-eteshare
@@ -36,18 +38,18 @@ spec:
       volumes:
         - name: robot-eteshare
           hostPath:
-            path: /dockerdata-nfs/onapdemo/robot/eteshare
+            path: /dockerdata-nfs/onap/robot/eteshare
         - name: robot-assets
           hostPath:
-            path: /dockerdata-nfs/onapdemo/robot/robot/assets
+            path: /dockerdata-nfs/onap/robot/robot/assets
         - name: robot-resources
           hostPath:
-            path: /dockerdata-nfs/onapdemo/robot/robot/resources
+            path: /dockerdata-nfs/onap/robot/robot/resources
         - name: robot-testsuites
           hostPath:
-            path: /dockerdata-nfs/onapdemo/robot/robot/testsuites
+            path: /dockerdata-nfs/onap/robot/robot/testsuites
         - name: lighttpd-authorization
           hostPath:
-            path: /dockerdata-nfs/onapdemo/robot/authorization
+            path: /dockerdata-nfs/onap/robot/authorization
       imagePullSecrets:
       - name: onap-docker-registry-key
diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
new file mode 100644
index 0000000000..f906599dda
--- /dev/null
+++ b/kubernetes/robot/values.yaml
@@ -0,0 +1,5 @@
+NS: onap-robot
+pullPolicy: Always
+image:
+  testsuite: nexus3.onap.org:10001/openecomp/testsuite:1.1-STAGING-latest
+
-- 
2.16.6