From 9daad02ddb9e43ed7e2d1af271792369d24ae586 Mon Sep 17 00:00:00 2001 From: kerenj Date: Wed, 23 Aug 2017 13:35:43 +0000 Subject: sdnc K8S-Helm Parameterization changed sdnc k8s deployment to support helm parameterization. updated image to 1.1 Issue-ID: OOM-52 Change-Id: Ie9ec8f60c80caffc69637bf83043902eef45dc18 Signed-off-by: kerenj --- kubernetes/sdnc/Chart.yaml | 4 + kubernetes/sdnc/all-services.yaml | 85 -------------------- kubernetes/sdnc/db-deployment.yaml | 38 --------- kubernetes/sdnc/dgbuilder-deployment.yaml | 64 --------------- kubernetes/sdnc/sdnc-deployment.yaml | 66 ---------------- kubernetes/sdnc/templates/all-services.yaml | 91 ++++++++++++++++++++++ kubernetes/sdnc/templates/db-deployment.yaml | 40 ++++++++++ .../sdnc/templates/dgbuilder-deployment.yaml | 66 ++++++++++++++++ kubernetes/sdnc/templates/sdnc-deployment.yaml | 68 ++++++++++++++++ kubernetes/sdnc/templates/web-deployment.yaml | 66 ++++++++++++++++ kubernetes/sdnc/values.yaml | 8 ++ kubernetes/sdnc/web-deployment.yaml | 64 --------------- 12 files changed, 343 insertions(+), 317 deletions(-) create mode 100644 kubernetes/sdnc/Chart.yaml delete mode 100644 kubernetes/sdnc/all-services.yaml delete mode 100644 kubernetes/sdnc/db-deployment.yaml delete mode 100644 kubernetes/sdnc/dgbuilder-deployment.yaml delete mode 100644 kubernetes/sdnc/sdnc-deployment.yaml create mode 100644 kubernetes/sdnc/templates/all-services.yaml create mode 100644 kubernetes/sdnc/templates/db-deployment.yaml create mode 100644 kubernetes/sdnc/templates/dgbuilder-deployment.yaml create mode 100644 kubernetes/sdnc/templates/sdnc-deployment.yaml create mode 100644 kubernetes/sdnc/templates/web-deployment.yaml create mode 100644 kubernetes/sdnc/values.yaml delete mode 100644 kubernetes/sdnc/web-deployment.yaml (limited to 'kubernetes/sdnc') diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml new file mode 100644 index 0000000000..2daeef2e46 --- /dev/null +++ b/kubernetes/sdnc/Chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +name: sdnc +version: 0.1.0 diff --git a/kubernetes/sdnc/all-services.yaml b/kubernetes/sdnc/all-services.yaml deleted file mode 100644 index ce18e028e9..0000000000 --- a/kubernetes/sdnc/all-services.yaml +++ /dev/null @@ -1,85 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: dbhost - labels: - app: sdnc-dbhost -spec: - ports: - - port: 3306 - selector: - app: sdnc-dbhost - clusterIP: None ---- -apiVersion: v1 -kind: Service -metadata: - name: sdnctldb01 - labels: - app: sdnc-dbhost -spec: - ports: - - port: 3306 - selector: - app: sdnc-dbhost - clusterIP: None ---- -apiVersion: v1 -kind: Service -metadata: - name: sdnctldb02 - labels: - app: sdnc-dbhost -spec: - ports: - - port: 3306 - selector: - app: sdnc-dbhost - clusterIP: None ---- -apiVersion: v1 -kind: Service -metadata: - name: sdnc-dgbuilder - labels: - app: sdnc-dgbuilder -spec: - ports: - - name: "sdnc-dgbuilder-port" - port: 3000 - targetPort: 3100 - nodePort: 30203 - type: NodePort - selector: - app: sdnc-dgbuilder ---- -apiVersion: v1 -kind: Service -metadata: - name: sdnhost - labels: - app: sdnc -spec: - ports: - - name: "sdnc-port" - port: 8282 - targetPort: 8181 - nodePort: 30202 - type: NodePort - selector: - app: sdnc ---- -apiVersion: v1 -kind: Service -metadata: - name: sdnc-portal - labels: - app: sdnc-portal -spec: - ports: - - name: "sdnc-portal-port" - port: 8843 - nodePort: 30201 - type: NodePort - selector: - app: sdnc-portal diff --git a/kubernetes/sdnc/db-deployment.yaml b/kubernetes/sdnc/db-deployment.yaml deleted file mode 100644 index 685edec242..0000000000 --- a/kubernetes/sdnc/db-deployment.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: sdnc-dbhost -spec: - selector: - matchLabels: - app: sdnc-dbhost - template: - metadata: - labels: - app: sdnc-dbhost - name: sdnc-dbhost - spec: - containers: - - env: - - name: MYSQL_ROOT_PASSWORD - value: openECOMP1.0 - - name: MYSQL_ROOT_HOST - value: '%' - image: mysql/mysql-server:5.6 - name: sdnc-db-container - volumeMounts: - - mountPath: /var/lib/mysql - name: sdnc-data - ports: - - containerPort: 3306 - readinessProbe: - tcpSocket: - port: 3306 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: sdnc-data - hostPath: - path: /dockerdata-nfs/onapdemo/sdnc/data - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/sdnc/dgbuilder-deployment.yaml b/kubernetes/sdnc/dgbuilder-deployment.yaml deleted file mode 100644 index 13781ff939..0000000000 --- a/kubernetes/sdnc/dgbuilder-deployment.yaml +++ /dev/null @@ -1,64 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: sdnc-dgbuilder -spec: - selector: - matchLabels: - app: sdnc-dgbuilder - template: - metadata: - labels: - app: sdnc-dgbuilder - name: sdnc-dgbuilder - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "sdnc-db-container", - "--container-name", - "sdnc-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": "sdnc-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 - image: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.0-STAGING-latest - name: sdnc-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/sdnc/sdnc-deployment.yaml b/kubernetes/sdnc/sdnc-deployment.yaml deleted file mode 100644 index 0dc48393e4..0000000000 --- a/kubernetes/sdnc/sdnc-deployment.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: sdnc -spec: - selector: - matchLabels: - app: sdnc - template: - metadata: - labels: - app: sdnc - name: sdnc - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "sdnc-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": "sdnc-readiness" - } - ]' - spec: - containers: - - command: - - /opt/openecomp/sdnc/bin/startODL.sh - env: - - name: MYSQL_ROOT_PASSWORD - value: openECOMP1.0 - - name: SDNC_CONFIG_DIR - value: /opt/openecomp/sdnc/data/properties - image: nexus3.onap.org:10001/openecomp/sdnc-image:1.0-STAGING-latest - name: sdnc-controller-container - volumeMounts: - - mountPath: /opt/openecomp/sdnc/data/properties - name: sdnc-conf - ports: - - containerPort: 8181 - readinessProbe: - tcpSocket: - port: 8181 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: sdnc-conf - hostPath: - path: /dockerdata-nfs/onapdemo/sdnc/conf - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/sdnc/templates/all-services.yaml b/kubernetes/sdnc/templates/all-services.yaml new file mode 100644 index 0000000000..af42db3063 --- /dev/null +++ b/kubernetes/sdnc/templates/all-services.yaml @@ -0,0 +1,91 @@ +apiVersion: v1 +kind: Service +metadata: + name: dbhost + namespace: {{ .Values.NS }} + labels: + app: sdnc-dbhost +spec: + ports: + - port: 3306 + selector: + app: sdnc-dbhost + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: sdnctldb01 + namespace: {{ .Values.NS }} + labels: + app: sdnc-dbhost +spec: + ports: + - port: 3306 + selector: + app: sdnc-dbhost + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: sdnctldb02 + namespace: {{ .Values.NS }} + labels: + app: sdnc-dbhost +spec: + ports: + - port: 3306 + selector: + app: sdnc-dbhost + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: sdnc-dgbuilder + namespace: {{ .Values.NS }} + labels: + app: sdnc-dgbuilder +spec: + ports: + - name: "sdnc-dgbuilder-port" + port: 3000 + targetPort: 3100 + nodePort: 30203 + type: NodePort + selector: + app: sdnc-dgbuilder +--- +apiVersion: v1 +kind: Service +metadata: + name: sdnhost + namespace: {{ .Values.NS }} + labels: + app: sdnc +spec: + ports: + - name: "sdnc-port" + port: 8282 + targetPort: 8181 + nodePort: 30202 + type: NodePort + selector: + app: sdnc +--- +apiVersion: v1 +kind: Service +metadata: + name: sdnc-portal + namespace: {{ .Values.NS }} + labels: + app: sdnc-portal +spec: + ports: + - name: "sdnc-portal-port" + port: 8843 + nodePort: 30201 + type: NodePort + selector: + app: sdnc-portal diff --git a/kubernetes/sdnc/templates/db-deployment.yaml b/kubernetes/sdnc/templates/db-deployment.yaml new file mode 100644 index 0000000000..1a2ecbae66 --- /dev/null +++ b/kubernetes/sdnc/templates/db-deployment.yaml @@ -0,0 +1,40 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: sdnc-dbhost + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: sdnc-dbhost + template: + metadata: + labels: + app: sdnc-dbhost + name: sdnc-dbhost + spec: + containers: + - env: + - name: MYSQL_ROOT_PASSWORD + value: openECOMP1.0 + - name: MYSQL_ROOT_HOST + value: '%' + image: {{ .Values.image.mysqlServer }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: sdnc-db-container + volumeMounts: + - mountPath: /var/lib/mysql + name: sdnc-data + ports: + - containerPort: 3306 + readinessProbe: + tcpSocket: + port: 3306 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: sdnc-data + hostPath: + path: /dockerdata-nfs/onapdemo/sdnc/data + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml new file mode 100644 index 0000000000..367043337b --- /dev/null +++ b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml @@ -0,0 +1,66 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: sdnc-dgbuilder + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: sdnc-dgbuilder + template: + metadata: + labels: + app: sdnc-dgbuilder + name: sdnc-dgbuilder + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "sdnc-db-container", + "--container-name", + "sdnc-controller-container" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "sdnc-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 + image: {{ .Values.image.dgbuilderSdnc }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: sdnc-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/sdnc/templates/sdnc-deployment.yaml b/kubernetes/sdnc/templates/sdnc-deployment.yaml new file mode 100644 index 0000000000..eb1fdc89fb --- /dev/null +++ b/kubernetes/sdnc/templates/sdnc-deployment.yaml @@ -0,0 +1,68 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: sdnc + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: sdnc + template: + metadata: + labels: + app: sdnc + name: sdnc + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "sdnc-db-container" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "sdnc-readiness" + } + ]' + spec: + containers: + - command: + - /opt/openecomp/sdnc/bin/startODL.sh + env: + - name: MYSQL_ROOT_PASSWORD + value: openECOMP1.0 + - name: SDNC_CONFIG_DIR + value: /opt/openecomp/sdnc/data/properties + image: {{ .Values.image.sdnc }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: sdnc-controller-container + volumeMounts: + - mountPath: /opt/openecomp/sdnc/data/properties + name: sdnc-conf + ports: + - containerPort: 8181 + readinessProbe: + tcpSocket: + port: 8181 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: sdnc-conf + hostPath: + path: /dockerdata-nfs/onapdemo/sdnc/conf + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/sdnc/templates/web-deployment.yaml b/kubernetes/sdnc/templates/web-deployment.yaml new file mode 100644 index 0000000000..280bf25400 --- /dev/null +++ b/kubernetes/sdnc/templates/web-deployment.yaml @@ -0,0 +1,66 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: sdnc-portal + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: sdnc-portal + template: + metadata: + labels: + app: sdnc-portal + name: sdnc-portal + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "sdnc-db-container", + "--container-name", + "sdnc-controller-container" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "sdnc-portal-readiness" + } + ]' + spec: + containers: + - command: + - /bin/bash + - -c + - cd /opt/openecomp/sdnc/admportal/shell && ./start_portal.sh + env: + - name: MYSQL_ROOT_PASSWORD + value: openECOMP1.0 + - name: SDNC_CONFIG_DIR + value: /opt/openecomp/sdnc/data/properties + image: {{ .Values.image.admportalSdnc }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: sdnc-portal-container + ports: + - containerPort: 8843 + readinessProbe: + tcpSocket: + port: 8843 + initialDelaySeconds: 5 + periodSeconds: 10 + restartPolicy: Always + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml new file mode 100644 index 0000000000..b9b3c0479f --- /dev/null +++ b/kubernetes/sdnc/values.yaml @@ -0,0 +1,8 @@ +NS: onap-sdnc +pullPolicy: Always +image: + readiness: oomk8s/readiness-check:1.0.0 + mysqlServer: mysql/mysql-server:5.6 + dgbuilderSdnc: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.1-STAGING-latest + sdnc: nexus3.onap.org:10001/openecomp/sdnc-image:1.1-STAGING-latest + admportalSdnc: nexus3.onap.org:10001/openecomp/admportal-sdnc-image:1.1-STAGING-latest diff --git a/kubernetes/sdnc/web-deployment.yaml b/kubernetes/sdnc/web-deployment.yaml deleted file mode 100644 index 36df93beea..0000000000 --- a/kubernetes/sdnc/web-deployment.yaml +++ /dev/null @@ -1,64 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: sdnc-portal -spec: - selector: - matchLabels: - app: sdnc-portal - template: - metadata: - labels: - app: sdnc-portal - name: sdnc-portal - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "sdnc-db-container", - "--container-name", - "sdnc-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": "sdnc-portal-readiness" - } - ]' - spec: - containers: - - command: - - /bin/bash - - -c - - cd /opt/openecomp/sdnc/admportal/shell && ./start_portal.sh - env: - - name: MYSQL_ROOT_PASSWORD - value: openECOMP1.0 - - name: SDNC_CONFIG_DIR - value: /opt/openecomp/sdnc/data/properties - image: nexus3.onap.org:10001/openecomp/admportal-sdnc-image:1.0-STAGING-latest - name: sdnc-portal-container - ports: - - containerPort: 8843 - readinessProbe: - tcpSocket: - port: 8843 - initialDelaySeconds: 5 - periodSeconds: 10 - restartPolicy: Always - imagePullSecrets: - - name: onap-docker-registry-key -- cgit 1.2.3-korg