From 6ca15a741dc9af484a5f8f296a5512ba06255a6e Mon Sep 17 00:00:00 2001 From: kerenj Date: Wed, 23 Aug 2017 12:05:23 +0000 Subject: appc K8S-Helm Parameterization changed appc k8s deployment to support helm parameterization. updated images to 1.1 Issue-ID: OOM-52 Change-Id: I6106c71f98c754c0e19e4cc987ea12e08bfdb903 Signed-off-by: kerenj --- kubernetes/appc/Chart.yaml | 4 ++ kubernetes/appc/all-services.yaml | 74 -------------------- kubernetes/appc/appc-deployment.yaml | 76 --------------------- kubernetes/appc/db-deployment.yaml | 38 ----------- kubernetes/appc/dgbuilder-deployment.yaml | 66 ------------------ kubernetes/appc/templates/all-services.yaml | 79 ++++++++++++++++++++++ kubernetes/appc/templates/appc-deployment.yaml | 78 +++++++++++++++++++++ kubernetes/appc/templates/db-deployment.yaml | 40 +++++++++++ .../appc/templates/dgbuilder-deployment.yaml | 68 +++++++++++++++++++ kubernetes/appc/values.yaml | 7 ++ kubernetes/oneclick/setenv.bash | 4 +- 11 files changed, 278 insertions(+), 256 deletions(-) create mode 100644 kubernetes/appc/Chart.yaml delete mode 100644 kubernetes/appc/all-services.yaml delete mode 100644 kubernetes/appc/appc-deployment.yaml delete mode 100644 kubernetes/appc/db-deployment.yaml delete mode 100644 kubernetes/appc/dgbuilder-deployment.yaml create mode 100644 kubernetes/appc/templates/all-services.yaml create mode 100644 kubernetes/appc/templates/appc-deployment.yaml create mode 100644 kubernetes/appc/templates/db-deployment.yaml create mode 100644 kubernetes/appc/templates/dgbuilder-deployment.yaml create mode 100644 kubernetes/appc/values.yaml diff --git a/kubernetes/appc/Chart.yaml b/kubernetes/appc/Chart.yaml new file mode 100644 index 0000000000..da4f1b3edc --- /dev/null +++ b/kubernetes/appc/Chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +name: appc +version: 0.1.0 diff --git a/kubernetes/appc/all-services.yaml b/kubernetes/appc/all-services.yaml deleted file mode 100644 index 8ce32acf91..0000000000 --- a/kubernetes/appc/all-services.yaml +++ /dev/null @@ -1,74 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: dbhost - labels: - app: appc-dbhost -spec: - ports: - - name: "appc-dbhost-port" - port: 3306 - selector: - app: appc-dbhost - clusterIP: None ---- -apiVersion: v1 -kind: Service -metadata: - name: sdnctldb01 - labels: - app: appc-dbhost -spec: - ports: - - port: 3306 - selector: - app: appc-dbhost - clusterIP: None ---- -apiVersion: v1 -kind: Service -metadata: - name: sdnctldb02 - labels: - app: appc-dbhost -spec: - ports: - - port: 3306 - selector: - app: appc-dbhost - clusterIP: None ---- -apiVersion: v1 -kind: Service -metadata: - name: sdnhost - labels: - app: appc -spec: - ports: - - name: "appc-port-8282" - port: 8282 - targetPort: 8181 - nodePort: 30230 - - name: "appc-port-1830" - port: 1830 - nodePort: 30231 - type: NodePort - selector: - app: appc ---- -apiVersion: v1 -kind: Service -metadata: - name: dgbuilder - labels: - app: appc-dgbuilder -spec: - ports: - - name: "appc-dgbuilder-port" - port: 3000 - targetPort: 3100 - nodePort: 30228 - type: NodePort - selector: - app: appc-dgbuilder diff --git a/kubernetes/appc/appc-deployment.yaml b/kubernetes/appc/appc-deployment.yaml deleted file mode 100644 index e2f2b4ead4..0000000000 --- a/kubernetes/appc/appc-deployment.yaml +++ /dev/null @@ -1,76 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: appc -spec: - selector: - matchLabels: - app: appc - template: - metadata: - labels: - app: appc - name: appc - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "appc-db-container" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "oomk8s/readiness-check:1.0.0", - "imagePullPolicy": "Always", - "name": "appc-readiness" - } - ]' - spec: - containers: - - command: - - /opt/openecomp/appc/bin/startODL.sh - env: - - name: MYSQL_ROOT_PASSWORD - value: openECOMP1.0 - - name: SDNC_CONFIG_DIR - value: /opt/openecomp/sdnc/data/properties - - name: APPC_CONFIG_DIR - value: /opt/openecomp/appc/data/properties - - name: DMAAP_TOPIC_ENV - value: SUCCESS - image: nexus3.onap.org:10001/openecomp/appc-image:1.0-STAGING-latest - name: appc-controller-container - volumeMounts: - - mountPath: /opt/openecomp/appc/data/properties - name: appc-conf - - mountPath: /opt/openecomp/sdnc/data/properties - name: sdnc-conf - ports: - - containerPort: 8181 - - containerPort: 1830 - readinessProbe: - tcpSocket: - port: 8181 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: appc-conf - hostPath: - path: /dockerdata-nfs/onapdemo/appc/conf - - name: sdnc-conf - hostPath: - path: /dockerdata-nfs/onapdemo/sdnc/conf - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/appc/db-deployment.yaml b/kubernetes/appc/db-deployment.yaml deleted file mode 100644 index ee796faca3..0000000000 --- a/kubernetes/appc/db-deployment.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: appc-dbhost -spec: - selector: - matchLabels: - app: appc-dbhost - template: - metadata: - labels: - app: appc-dbhost - spec: - containers: - - env: - - name: MYSQL_ROOT_PASSWORD - value: openECOMP1.0 - - name: MYSQL_ROOT_HOST - value: '%' - image: mysql/mysql-server:5.6 - name: appc-db-container - volumeMounts: - - mountPath: /var/lib/mysql - name: appc-data - ports: - - containerPort: 3306 - readinessProbe: - tcpSocket: - port: 3306 - initialDelaySeconds: 5 - periodSeconds: 10 - restartPolicy: Always - volumes: - - name: appc-data - hostPath: - path: /dockerdata-nfs/onapdemo/appc/data - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/appc/dgbuilder-deployment.yaml b/kubernetes/appc/dgbuilder-deployment.yaml deleted file mode 100644 index de8149390c..0000000000 --- a/kubernetes/appc/dgbuilder-deployment.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: appc-dgbuilder -spec: - selector: - matchLabels: - app: appc-dgbuilder - template: - metadata: - labels: - app: appc-dgbuilder - name: appc-dgbuilder - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "appc-db-container", - "--container-name", - "appc-controller-container" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "oomk8s/readiness-check:1.0.0", - "imagePullPolicy": "Always", - "name": "appc-dgbuilder-readiness" - } - ]' - spec: - containers: - - command: - - /bin/bash - - -c - - cd /opt/openecomp/sdnc/dgbuilder/ && ./start sdnc1.0 && wait - env: - - name: MYSQL_ROOT_PASSWORD - value: openECOMP1.0 - - name: SDNC_CONFIG_DIR - value: /opt/openecomp/sdnc/data/properties - - name: APPC_CONFIG_DIR - value: /opt/openecomp/appc/data/properties - image: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.0-STAGING-latest - name: appc-dgbuilder-container - ports: - - containerPort: 3100 - readinessProbe: - tcpSocket: - port: 3100 - initialDelaySeconds: 5 - periodSeconds: 10 - restartPolicy: Always - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/appc/templates/all-services.yaml b/kubernetes/appc/templates/all-services.yaml new file mode 100644 index 0000000000..939ef7fba7 --- /dev/null +++ b/kubernetes/appc/templates/all-services.yaml @@ -0,0 +1,79 @@ +apiVersion: v1 +kind: Service +metadata: + name: dbhost + namespace: {{ .Values.NS }} + labels: + app: appc-dbhost +spec: + ports: + - name: "appc-dbhost-port" + port: 3306 + selector: + app: appc-dbhost + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: sdnctldb01 + namespace: {{ .Values.NS }} + labels: + app: appc-dbhost +spec: + ports: + - port: 3306 + selector: + app: appc-dbhost + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: sdnctldb02 + namespace: {{ .Values.NS }} + labels: + app: appc-dbhost +spec: + ports: + - port: 3306 + selector: + app: appc-dbhost + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: sdnhost + namespace: {{ .Values.NS }} + labels: + app: appc +spec: + ports: + - name: "appc-port-8282" + port: 8282 + targetPort: 8181 + nodePort: 30230 + - name: "appc-port-1830" + port: 1830 + nodePort: 30231 + type: NodePort + selector: + app: appc +--- +apiVersion: v1 +kind: Service +metadata: + name: dgbuilder + namespace: {{ .Values.NS }} + labels: + app: appc-dgbuilder +spec: + ports: + - name: "appc-dgbuilder-port" + port: 3000 + targetPort: 3100 + nodePort: 30228 + type: NodePort + selector: + app: appc-dgbuilder diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml new file mode 100644 index 0000000000..0bd93f8fb6 --- /dev/null +++ b/kubernetes/appc/templates/appc-deployment.yaml @@ -0,0 +1,78 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: appc + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: appc + template: + metadata: + labels: + app: appc + name: appc + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "appc-db-container" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "appc-readiness" + } + ]' + spec: + containers: + - command: + - /opt/openecomp/appc/bin/startODL.sh + env: + - name: MYSQL_ROOT_PASSWORD + value: openECOMP1.0 + - name: SDNC_CONFIG_DIR + value: /opt/openecomp/sdnc/data/properties + - name: APPC_CONFIG_DIR + value: /opt/openecomp/appc/data/properties + - name: DMAAP_TOPIC_ENV + value: SUCCESS + image: {{ .Values.image.appc }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: appc-controller-container + volumeMounts: + - mountPath: /opt/openecomp/appc/data/properties + name: appc-conf + - mountPath: /opt/openecomp/sdnc/data/properties + name: sdnc-conf + ports: + - containerPort: 8181 + - containerPort: 1830 + readinessProbe: + tcpSocket: + port: 8181 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: appc-conf + hostPath: + path: /dockerdata-nfs/onap/appc/conf + - name: sdnc-conf + hostPath: + path: /dockerdata-nfs/onap/sdnc/conf + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/appc/templates/db-deployment.yaml b/kubernetes/appc/templates/db-deployment.yaml new file mode 100644 index 0000000000..f7b55187a0 --- /dev/null +++ b/kubernetes/appc/templates/db-deployment.yaml @@ -0,0 +1,40 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: appc-dbhost + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: appc-dbhost + template: + metadata: + labels: + app: appc-dbhost + spec: + containers: + - env: + - name: MYSQL_ROOT_PASSWORD + value: openECOMP1.0 + - name: MYSQL_ROOT_HOST + value: '%' + image: {{ .Values.image.mysqlServer }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: appc-db-container + volumeMounts: + - mountPath: /var/lib/mysql + name: appc-data + ports: + - containerPort: 3306 + readinessProbe: + tcpSocket: + port: 3306 + initialDelaySeconds: 5 + periodSeconds: 10 + restartPolicy: Always + volumes: + - name: appc-data + hostPath: + path: /dockerdata-nfs/onap/appc/data + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/appc/templates/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml new file mode 100644 index 0000000000..54bf596a97 --- /dev/null +++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml @@ -0,0 +1,68 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: appc-dgbuilder + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: appc-dgbuilder + template: + metadata: + labels: + app: appc-dgbuilder + name: appc-dgbuilder + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "appc-db-container", + "--container-name", + "appc-controller-container" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "appc-dgbuilder-readiness" + } + ]' + spec: + containers: + - command: + - /bin/bash + - -c + - cd /opt/openecomp/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait + env: + - name: MYSQL_ROOT_PASSWORD + value: openECOMP1.0 + - name: SDNC_CONFIG_DIR + value: /opt/openecomp/sdnc/data/properties + - name: APPC_CONFIG_DIR + value: /opt/openecomp/appc/data/properties + image: {{ .Values.image.dgbuilderSdnc }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: appc-dgbuilder-container + ports: + - containerPort: 3100 + readinessProbe: + tcpSocket: + port: 3100 + initialDelaySeconds: 5 + periodSeconds: 10 + restartPolicy: Always + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml new file mode 100644 index 0000000000..22000a7a36 --- /dev/null +++ b/kubernetes/appc/values.yaml @@ -0,0 +1,7 @@ +NS: onap-appc +pullPolicy: Always +image: + readiness: oomk8s/readiness-check:1.0.0 + appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest + mysqlServer: mysql/mysql-server:5.6 + dgbuilderSdnc: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.1-STAGING-latest diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash index 070dce9a7f..b24d5aa627 100644 --- a/kubernetes/oneclick/setenv.bash +++ b/kubernetes/oneclick/setenv.bash @@ -1,7 +1,7 @@ #!/bin/bash -HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy') -ONAP_APPS=('sdc' 'aai' 'appc') +HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc') +ONAP_APPS=('sdc' 'aai') 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} -- cgit 1.2.3-korg