From fc2caa6c458c77e10e738a8e9af058d222ac9405 Mon Sep 17 00:00:00 2001 From: kerenj Date: Wed, 23 Aug 2017 12:46:02 +0000 Subject: 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 --- kubernetes/oneclick/setenv.bash | 4 +- kubernetes/robot/Chart.yaml | 4 ++ kubernetes/robot/robot-deployment.yaml | 53 ----------------------- kubernetes/robot/templates/all-services.yaml | 14 ++++++ kubernetes/robot/templates/robot-deployment.yaml | 55 ++++++++++++++++++++++++ kubernetes/robot/values.yaml | 5 +++ 6 files changed, 80 insertions(+), 55 deletions(-) create mode 100644 kubernetes/robot/Chart.yaml delete mode 100644 kubernetes/robot/robot-deployment.yaml create mode 100644 kubernetes/robot/templates/all-services.yaml create mode 100644 kubernetes/robot/templates/robot-deployment.yaml create mode 100644 kubernetes/robot/values.yaml (limited to 'kubernetes') 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/robot-deployment.yaml b/kubernetes/robot/robot-deployment.yaml deleted file mode 100644 index ade71472fa..0000000000 --- a/kubernetes/robot/robot-deployment.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: robot -spec: - selector: - matchLabels: - app: robot - template: - metadata: - labels: - app: robot - name: robot - spec: - containers: - - image: nexus3.onap.org:10001/openecomp/testsuite:1.0-STAGING-latest - name: robot - volumeMounts: - - name: robot-eteshare - mountPath: /share - - name: robot-assets - mountPath: /var/opt/OpenECOMP_ETE/robot/assets - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources - - name: robot-testsuites - mountPath: /var/opt/OpenECOMP_ETE/robot/testsuites - - name: lighttpd-authorization - mountPath: /etc/lighttpd/authorization - ports: - - containerPort: 88 - readinessProbe: - tcpSocket: - port: 88 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: robot-eteshare - hostPath: - path: /dockerdata-nfs/onapdemo/robot/eteshare - - name: robot-assets - hostPath: - path: /dockerdata-nfs/onapdemo/robot/robot/assets - - name: robot-resources - hostPath: - path: /dockerdata-nfs/onapdemo/robot/robot/resources - - name: robot-testsuites - hostPath: - path: /dockerdata-nfs/onapdemo/robot/robot/testsuites - - name: lighttpd-authorization - hostPath: - path: /dockerdata-nfs/onapdemo/robot/authorization - imagePullSecrets: - - name: onap-docker-registry-key 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/templates/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml new file mode 100644 index 0000000000..c4bc9544d8 --- /dev/null +++ b/kubernetes/robot/templates/robot-deployment.yaml @@ -0,0 +1,55 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: robot + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: robot + template: + metadata: + labels: + app: robot + name: robot + spec: + containers: + - image: {{ .Values.image.testsuite }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: robot + volumeMounts: + - name: robot-eteshare + mountPath: /share + - name: robot-assets + mountPath: /var/opt/OpenECOMP_ETE/robot/assets + - name: robot-resources + mountPath: /var/opt/OpenECOMP_ETE/robot/resources + - name: robot-testsuites + mountPath: /var/opt/OpenECOMP_ETE/robot/testsuites + - name: lighttpd-authorization + mountPath: /etc/lighttpd/authorization + ports: + - containerPort: 88 + readinessProbe: + tcpSocket: + port: 88 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: robot-eteshare + hostPath: + path: /dockerdata-nfs/onap/robot/eteshare + - name: robot-assets + hostPath: + path: /dockerdata-nfs/onap/robot/robot/assets + - name: robot-resources + hostPath: + path: /dockerdata-nfs/onap/robot/robot/resources + - name: robot-testsuites + hostPath: + path: /dockerdata-nfs/onap/robot/robot/testsuites + - name: lighttpd-authorization + hostPath: + 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 + -- cgit 1.2.3-korg