From bf4b4a00464a1adfea03155ee3b9491ac0fe9f4d Mon Sep 17 00:00:00 2001 From: kerenj Date: Wed, 23 Aug 2017 07:39:14 +0000 Subject: VID K8S-Helm Parameterization changed VID k8s deployment to support helm parameterization Issue-ID: OOM-52 Change-Id: Ide19bfaa611dfbff8080bd755b6dc820d3691894 y Signed-off-by: kerenj --- kubernetes/vid/Chart.yaml | 4 + kubernetes/vid/all-services.yaml | 26 ------ kubernetes/vid/templates/all-services.yaml | 28 +++++++ .../vid/templates/vid-mariadb-deployment.yaml | 56 +++++++++++++ .../vid/templates/vid-server-deployment.yaml | 97 ++++++++++++++++++++++ kubernetes/vid/values.yaml | 6 ++ kubernetes/vid/vid-mariadb-deployment.yaml | 54 ------------ kubernetes/vid/vid-server-deployment.yaml | 95 --------------------- 8 files changed, 191 insertions(+), 175 deletions(-) create mode 100644 kubernetes/vid/Chart.yaml delete mode 100644 kubernetes/vid/all-services.yaml create mode 100644 kubernetes/vid/templates/all-services.yaml create mode 100644 kubernetes/vid/templates/vid-mariadb-deployment.yaml create mode 100644 kubernetes/vid/templates/vid-server-deployment.yaml create mode 100644 kubernetes/vid/values.yaml delete mode 100644 kubernetes/vid/vid-mariadb-deployment.yaml delete mode 100644 kubernetes/vid/vid-server-deployment.yaml (limited to 'kubernetes/vid') diff --git a/kubernetes/vid/Chart.yaml b/kubernetes/vid/Chart.yaml new file mode 100644 index 0000000000..68b43f40ce --- /dev/null +++ b/kubernetes/vid/Chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +name: vid +version: 0.1.0 diff --git a/kubernetes/vid/all-services.yaml b/kubernetes/vid/all-services.yaml deleted file mode 100644 index 4b5b082e6c..0000000000 --- a/kubernetes/vid/all-services.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: vid-mariadb -spec: - ports: - - name: vid-mariadb - port: 3306 - selector: - app: vid-mariadb - clusterIP: None ---- -apiVersion: v1 -kind: Service -metadata: - labels: - app: vid-server - name: vid-server -spec: - ports: - - name: vid-server - nodePort: 30200 - port: 8080 - selector: - app: vid-server - type: NodePort diff --git a/kubernetes/vid/templates/all-services.yaml b/kubernetes/vid/templates/all-services.yaml new file mode 100644 index 0000000000..1018dedb2b --- /dev/null +++ b/kubernetes/vid/templates/all-services.yaml @@ -0,0 +1,28 @@ +apiVersion: v1 +kind: Service +metadata: + name: vid-mariadb + namespace: {{ .Values.NS }} +spec: + ports: + - name: vid-mariadb + port: 3306 + selector: + app: vid-mariadb + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app: vid-server + name: vid-server + namespace: {{ .Values.NS }} +spec: + ports: + - name: vid-server + nodePort: 30200 + port: 8080 + selector: + app: vid-server + type: NodePort diff --git a/kubernetes/vid/templates/vid-mariadb-deployment.yaml b/kubernetes/vid/templates/vid-mariadb-deployment.yaml new file mode 100644 index 0000000000..cf3b8a22e0 --- /dev/null +++ b/kubernetes/vid/templates/vid-mariadb-deployment.yaml @@ -0,0 +1,56 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: vid-mariadb + name: vid-mariadb + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: vid-mariadb + template: + metadata: + labels: + app: vid-mariadb + name: vid-mariadb + spec: + containers: + - image: {{ .Values.image.mariadb }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: vid-mariadb + env: + - name: MYSQL_DATABASE + value: vid_openecomp_epsdk + - name: MYSQL_USER + value: vidadmin + - name: MYSQL_PASSWORD + value: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + - name: MYSQL_ROOT_PASSWORD + value: LF+tp_1WqgSY + volumeMounts: + - mountPath: /var/lib/mysql + name: vid-mariadb-data + - mountPath: /docker-entrypoint-initdb.d/vid-pre-init.sql + name: vid-pre-init + - mountPath: /etc/mysql/my.cnf + name: my-cnf + ports: + - containerPort: 3306 + readinessProbe: + tcpSocket: + port: 3306 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: vid-mariadb-data + hostPath: + path: /dockerdata-nfs/onap/vid/mariadb/data + - name: vid-pre-init + hostPath: + path: /dockerdata-nfs/onap/vid/vid/lf_config/vid-pre-init.sql + - name: my-cnf + hostPath: + path: /dockerdata-nfs/onap/vid/vid/lf_config/vid-my.cnf + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml new file mode 100644 index 0000000000..58ce80b80b --- /dev/null +++ b/kubernetes/vid/templates/vid-server-deployment.yaml @@ -0,0 +1,97 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: vid-server + name: vid-server + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: vid-server + template: + metadata: + labels: + app: vid-server + name: vid-server + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "vid-mariadb" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "vid-server-readiness" + } + ]' + spec: + containers: + - env: + - name: ASDC_CLIENT_REST_HOST + value: sdc-be.onap-sdc + - name: ASDC_CLIENT_REST_AUTH + value: Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU= + - name: ASDC_CLIENT_REST_PORT + value: "8080" + - name: VID_AAI_HOST + value: aai-service.onap-aai + - name: VID_AAI_PORT + value: "8443" + - name: VID_ECOMP_SHARED_CONTEXT_REST_URL + value: http://portalapps.onap-portal:8989/ECOMPPORTAL/context + - name: VID_MSO_SERVER_URL + value: http://mso.onap-mso:8080 + - name: VID_MSO_PASS + value: 51515201a8d4c5c08d533db9bd1e1a9b + - name: MSO_DME2_SERVER_URL + value: http://localhost:8081 + - name: MSO_DME2_ENABLED + value: "false" + - name: VID_ECOMP_REDIRECT_URL + value: http://portalapps.onap-portal:8989/ECOMPPORTAL/login.htm + - name: VID_ECOMP_REST_URL + value: http://portalapps.onap-portal:8989/ECOMPPORTAL/auxapi + - name: VID_CONTACT_US_LINK + value: https://todo_contact_us_link.com + - name: VID_UEB_URL_LIST + value: dmaap.onap-message-router + - name: VID_MYSQL_HOST + value: vid-mariadb + - name: VID_MYSQL_PORT + value: "3306" + - name: VID_MYSQL_DBNAME + value: vid_openecomp_epsdk + - name: VID_MYSQL_USER + value: vidadmin + - name: VID_MYSQL_PASS + value: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + - name: VID_MYSQL_MAXCONNECTIONS + value: "5" + image: {{ .Values.image.vid }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: vid-server + ports: + - containerPort: 8080 + readinessProbe: + tcpSocket: + port: 8080 + initialDelaySeconds: 5 + periodSeconds: 10 + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml new file mode 100644 index 0000000000..a8d7a5b093 --- /dev/null +++ b/kubernetes/vid/values.yaml @@ -0,0 +1,6 @@ +NS: onap-vid +pullPolicy: IfNotPresent +image: + readiness: oomk8s/readiness-check:1.0.0 + mariadb: mariadb:10 + vid: nexus3.onap.org:10001/openecomp/vid:1.1-STAGING-latest diff --git a/kubernetes/vid/vid-mariadb-deployment.yaml b/kubernetes/vid/vid-mariadb-deployment.yaml deleted file mode 100644 index c34bce9c1b..0000000000 --- a/kubernetes/vid/vid-mariadb-deployment.yaml +++ /dev/null @@ -1,54 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - labels: - app: vid-mariadb - name: vid-mariadb -spec: - selector: - matchLabels: - app: vid-mariadb - template: - metadata: - labels: - app: vid-mariadb - name: vid-mariadb - spec: - containers: - - image: nexus3.onap.org:10001/library/mariadb:10 - name: vid-mariadb - env: - - name: MYSQL_DATABASE - value: vid_openecomp_epsdk - - name: MYSQL_USER - value: vidadmin - - name: MYSQL_PASSWORD - value: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - - name: MYSQL_ROOT_PASSWORD - value: LF+tp_1WqgSY - volumeMounts: - - mountPath: /var/lib/mysql - name: vid-mariadb-data - - mountPath: /docker-entrypoint-initdb.d/vid-pre-init.sql - name: vid-pre-init - - mountPath: /etc/mysql/my.cnf - name: my-cnf - ports: - - containerPort: 3306 - readinessProbe: - tcpSocket: - port: 3306 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: vid-mariadb-data - hostPath: - path: /dockerdata-nfs/onapdemo/vid/mariadb/data - - name: vid-pre-init - hostPath: - path: /dockerdata-nfs/onapdemo/vid/vid/lf_config/vid-pre-init.sql - - name: my-cnf - hostPath: - path: /dockerdata-nfs/onapdemo/vid/vid/lf_config/vid-my.cnf - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/vid/vid-server-deployment.yaml b/kubernetes/vid/vid-server-deployment.yaml deleted file mode 100644 index 5028297f5e..0000000000 --- a/kubernetes/vid/vid-server-deployment.yaml +++ /dev/null @@ -1,95 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - labels: - app: vid-server - name: vid-server -spec: - selector: - matchLabels: - app: vid-server - template: - metadata: - labels: - app: vid-server - name: vid-server - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "vid-mariadb" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "oomk8s/readiness-check:1.0.0", - "imagePullPolicy": "Always", - "name": "vid-server-readiness" - } - ]' - spec: - containers: - - env: - - name: ASDC_CLIENT_REST_HOST - value: sdc-be.onap-sdc - - name: ASDC_CLIENT_REST_AUTH - value: Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU= - - name: ASDC_CLIENT_REST_PORT - value: "8080" - - name: VID_AAI_HOST - value: aai-service.onap-aai - - name: VID_AAI_PORT - value: "8443" - - name: VID_ECOMP_SHARED_CONTEXT_REST_URL - value: http://portalapps.onap-portal:8989/ECOMPPORTAL/context - - name: VID_MSO_SERVER_URL - value: http://mso.onap-mso:8080 - - name: VID_MSO_PASS - value: 51515201a8d4c5c08d533db9bd1e1a9b - - name: MSO_DME2_SERVER_URL - value: http://localhost:8081 - - name: MSO_DME2_ENABLED - value: "false" - - name: VID_ECOMP_REDIRECT_URL - value: http://portalapps.onap-portal:8989/ECOMPPORTAL/login.htm - - name: VID_ECOMP_REST_URL - value: http://portalapps.onap-portal:8989/ECOMPPORTAL/auxapi - - name: VID_CONTACT_US_LINK - value: https://todo_contact_us_link.com - - name: VID_UEB_URL_LIST - value: dmaap.onap-message-router - - name: VID_MYSQL_HOST - value: vid-mariadb - - name: VID_MYSQL_PORT - value: "3306" - - name: VID_MYSQL_DBNAME - value: vid_openecomp_epsdk - - name: VID_MYSQL_USER - value: vidadmin - - name: VID_MYSQL_PASS - value: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - - name: VID_MYSQL_MAXCONNECTIONS - value: "5" - image: nexus3.onap.org:10001/openecomp/vid:1.1-STAGING-latest - name: vid-server - ports: - - containerPort: 8080 - readinessProbe: - tcpSocket: - port: 8080 - initialDelaySeconds: 5 - periodSeconds: 10 - imagePullSecrets: - - name: onap-docker-registry-key -- cgit 1.2.3-korg