From: kerenj Date: Wed, 23 Aug 2017 08:40:41 +0000 (+0000) Subject: message-router K8S-Helm Parameterization X-Git-Tag: 2.0.0-ONAP~742 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9e77b21fc896b5018af2bfb27053a3273bfae31c;p=oom.git message-router K8S-Helm Parameterization changed message-router k8s deployment to support helm parameterization Issue-ID: OOM-52 Change-Id: I6a46293e4b38d7c7ed91a5642de6c169193f14d5 Signed-off-by: kerenj --- diff --git a/kubernetes/message-router/Chart.yaml b/kubernetes/message-router/Chart.yaml new file mode 100644 index 0000000000..6341c5ca40 --- /dev/null +++ b/kubernetes/message-router/Chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +name: message-router +version: 0.1.0 diff --git a/kubernetes/message-router/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml similarity index 87% rename from kubernetes/message-router/all-services.yaml rename to kubernetes/message-router/templates/all-services.yaml index ef13b8e321..38fee01b22 100644 --- a/kubernetes/message-router/all-services.yaml +++ b/kubernetes/message-router/templates/all-services.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: zookeeper + namespace: {{ .Values.NS }} labels: app: zookeeper spec: @@ -16,6 +17,7 @@ apiVersion: v1 kind: Service metadata: name: global-kafka + namespace: {{ .Values.NS }} labels: app: global-kafka spec: @@ -30,6 +32,7 @@ apiVersion: v1 kind: Service metadata: name: dmaap + namespace: {{ .Values.NS }} labels: app: dmaap version: 1.0.0 diff --git a/kubernetes/message-router/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml similarity index 79% rename from kubernetes/message-router/message-router-dmaap.yaml rename to kubernetes/message-router/templates/message-router-dmaap.yaml index 8d85b8f929..eda5093178 100644 --- a/kubernetes/message-router/message-router-dmaap.yaml +++ b/kubernetes/message-router/templates/message-router-dmaap.yaml @@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: dmaap + namespace: {{ .Values.NS }} spec: selector: matchLabels: @@ -34,15 +35,15 @@ spec: } } ], - "image": "oomk8s/readiness-check:1.0.0", - "imagePullPolicy": "Always", + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", "name": "dmaap-readiness" } ]' spec: containers: - - image: attos/dmaap:latest - imagePullPolicy: Always + - image: {{ .Values.image.dmaap }} + imagePullPolicy: {{ .Values.pullPolicy }} name: dmaap ports: - containerPort: 3904 @@ -63,12 +64,12 @@ spec: volumes: - name: appprops hostPath: - path: /dockerdata-nfs/onapdemo/message-router/dmaap/MsgRtrApi.properties + path: /dockerdata-nfs/onap/message-router/dmaap/MsgRtrApi.properties - name: cadi hostPath: - path: /dockerdata-nfs/onapdemo/message-router/dmaap/cadi.properties + path: /dockerdata-nfs/onap/message-router/dmaap/cadi.properties - name: mykey hostPath: - path: /dockerdata-nfs/onapdemo/message-router/dmaap/mykey + path: /dockerdata-nfs/onap/message-router/dmaap/mykey imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/message-router/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml similarity index 81% rename from kubernetes/message-router/message-router-kafka.yaml rename to kubernetes/message-router/templates/message-router-kafka.yaml index 91b6e29f45..cb2f3e97bf 100644 --- a/kubernetes/message-router/message-router-kafka.yaml +++ b/kubernetes/message-router/templates/message-router-kafka.yaml @@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: global-kafka + namespace: {{ .Values.NS }} spec: selector: matchLabels: @@ -32,15 +33,15 @@ spec: } } ], - "image": "oomk8s/readiness-check:1.0.0", - "imagePullPolicy": "Always", + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", "name": "kafka-readiness" } ]' spec: containers: - - image: wurstmeister/kafka:latest - imagePullPolicy: Always + - image: {{ .Values.image.kafka }} + imagePullPolicy: {{ .Values.pullPolicy }} name: global-kafka ports: - containerPort: 9092 @@ -74,9 +75,9 @@ spec: path: /var/run/docker.sock - name: kafka-data hostPath: - path: /dockerdata-nfs/onapdemo/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/ + path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/ - name: start-kafka hostPath: - path: /dockerdata-nfs/onapdemo/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh + path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/message-router/message-router-zookeeper.yaml b/kubernetes/message-router/templates/message-router-zookeeper.yaml similarity index 87% rename from kubernetes/message-router/message-router-zookeeper.yaml rename to kubernetes/message-router/templates/message-router-zookeeper.yaml index c1f9f07fac..795227b821 100644 --- a/kubernetes/message-router/message-router-zookeeper.yaml +++ b/kubernetes/message-router/templates/message-router-zookeeper.yaml @@ -30,6 +30,6 @@ spec: volumes: - name: zookeeper-data hostPath: - path: /dockerdata-nfs/onapdemo/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper + path: /dockerdata-nfs/onap/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/message-router/values.yaml b/kubernetes/message-router/values.yaml new file mode 100644 index 0000000000..b69aa0081a --- /dev/null +++ b/kubernetes/message-router/values.yaml @@ -0,0 +1,7 @@ +NS: onap-message-router +pullPolicy: Always +image: + readiness: oomk8s/readiness-check:1.0.0 + dmaap: attos/dmaap:latest + kafka: wurstmeister/kafka:latest + zookeeper: wurstmeister/zookeeper:latest diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash index eb9bdb206c..aaaffeaa91 100644 --- a/kubernetes/oneclick/setenv.bash +++ b/kubernetes/oneclick/setenv.bash @@ -1,7 +1,7 @@ #!/bin/bash -HELM_APPS=('mso') -ONAP_APPS=('sdc' 'aai' 'message-router' 'robot' 'vid' 'sdnc' 'portal' 'policy' 'appc') +HELM_APPS=('mso' 'message-router') +ONAP_APPS=('sdc' 'aai' 'robot' 'vid' 'sdnc' '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}