From 74d723a8696a22dcbe8c0eee131540b45822a1af Mon Sep 17 00:00:00 2001 From: kerenj Date: Tue, 22 Aug 2017 15:27:04 +0000 Subject: MSO K8S-Helm Parameterization changed MSO k8s deployment to support helm parameterization Issue-ID: OOM-52 Change-Id: Ifb192ee2d417aae6b0bdd05d662229e3542e7944 Signed-off-by: kerenj --- kubernetes/mso/Chart.yaml | 4 ++ kubernetes/mso/all-services.yaml | 40 --------------- kubernetes/mso/db-deployment.yaml | 49 ------------------ kubernetes/mso/mso-deployment.yaml | 74 --------------------------- kubernetes/mso/templates/all-services.yaml | 42 +++++++++++++++ kubernetes/mso/templates/db-deployment.yaml | 51 +++++++++++++++++++ kubernetes/mso/templates/mso-deployment.yaml | 76 ++++++++++++++++++++++++++++ kubernetes/mso/values.yaml | 7 +++ 8 files changed, 180 insertions(+), 163 deletions(-) create mode 100644 kubernetes/mso/Chart.yaml delete mode 100644 kubernetes/mso/all-services.yaml delete mode 100644 kubernetes/mso/db-deployment.yaml delete mode 100644 kubernetes/mso/mso-deployment.yaml create mode 100644 kubernetes/mso/templates/all-services.yaml create mode 100644 kubernetes/mso/templates/db-deployment.yaml create mode 100644 kubernetes/mso/templates/mso-deployment.yaml create mode 100644 kubernetes/mso/values.yaml (limited to 'kubernetes/mso') diff --git a/kubernetes/mso/Chart.yaml b/kubernetes/mso/Chart.yaml new file mode 100644 index 0000000000..ad01a78d2d --- /dev/null +++ b/kubernetes/mso/Chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +name: mso +version: 0.1.0 diff --git a/kubernetes/mso/all-services.yaml b/kubernetes/mso/all-services.yaml deleted file mode 100644 index 881ebba4a9..0000000000 --- a/kubernetes/mso/all-services.yaml +++ /dev/null @@ -1,40 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: mariadb - labels: - app: mariadb -spec: - ports: - - port: 3306 - nodePort: 30252 - selector: - app: mariadb - type: NodePort ---- -apiVersion: v1 -kind: Service -metadata: - name: mso - labels: - app: mso -spec: - selector: - app: mso - ports: - - name: mso1 - port: 8080 - nodePort: 30223 - - name: mso2 - port: 3904 - nodePort: 30225 - - name: mso3 - port: 3905 - nodePort: 30224 - - name: mso4 - port: 9990 - nodePort: 30222 - - name: mso5 - port: 8787 - nodePort: 30250 - type: NodePort diff --git a/kubernetes/mso/db-deployment.yaml b/kubernetes/mso/db-deployment.yaml deleted file mode 100644 index f57f4bac87..0000000000 --- a/kubernetes/mso/db-deployment.yaml +++ /dev/null @@ -1,49 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: mariadb -spec: - replicas: 1 - selector: - matchLabels: - app: mariadb - template: - metadata: - labels: - app: mariadb - name: mariadb - spec: - hostname: mariadb - containers: - - args: - image: nexus3.onap.org:10001/mariadb:10.1.11 - name: "mariadb" - env: - - name: MYSQL_ROOT_PASSWORD - value: password - - name: MARIADB_MAJOR - value: "10.1" - - name: MARIADB_VERSION - value: "10.1.11+maria-1~jessie" - volumeMounts: - - mountPath: /etc/mysql/conf.d - name: mso-mariadb-conf - - mountPath: /docker-entrypoint-initdb.d - name: mso-mariadb-docker-entrypoint-initdb - ports: - - containerPort: 3306 - name: mariadb - readinessProbe: - tcpSocket: - port: 3306 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: mso-mariadb-conf - hostPath: - path: /dockerdata-nfs/onapdemo/mso/mariadb/conf.d - - name: mso-mariadb-docker-entrypoint-initdb - hostPath: - path: /dockerdata-nfs/onapdemo/mso/mariadb/docker-entrypoint-initdb.d - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/mso/mso-deployment.yaml b/kubernetes/mso/mso-deployment.yaml deleted file mode 100644 index fb052df734..0000000000 --- a/kubernetes/mso/mso-deployment.yaml +++ /dev/null @@ -1,74 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: mso -spec: - replicas: 1 - selector: - matchLabels: - app: mso - template: - metadata: - labels: - app: mso - name: mso - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "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": "mso-readiness" - } - ]' - spec: - containers: - - command: - - /docker-files/scripts/start-jboss-server.sh - image: nexus3.onap.org:10001/openecomp/mso:1.0-STAGING-latest - name: mso - volumeMounts: - - mountPath: /shared - name: mso - - mountPath: /docker-files - name: mso-docker-files - env: - - name: JBOSS_DEBUG - value: "false" - ports: - - containerPort: 3904 - - containerPort: 3905 - - containerPort: 8080 - - containerPort: 9990 - - containerPort: 8787 - readinessProbe: - tcpSocket: - port: 8080 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: mso - hostPath: - path: /dockerdata-nfs/onapdemo/mso/mso - - name: mso-docker-files - hostPath: - path: /dockerdata-nfs/onapdemo/mso/docker-files - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/mso/templates/all-services.yaml b/kubernetes/mso/templates/all-services.yaml new file mode 100644 index 0000000000..6e2db71650 --- /dev/null +++ b/kubernetes/mso/templates/all-services.yaml @@ -0,0 +1,42 @@ +apiVersion: v1 +kind: Service +metadata: + name: mariadb + namespace: {{ .Values.NS }} + labels: + app: mariadb +spec: + ports: + - port: 3306 + nodePort: 30252 + selector: + app: mariadb + type: NodePort +--- +apiVersion: v1 +kind: Service +metadata: + name: mso + namespace: {{ .Values.NS }} + labels: + app: mso +spec: + selector: + app: mso + ports: + - name: mso1 + port: 8080 + nodePort: 30223 + - name: mso2 + port: 3904 + nodePort: 30225 + - name: mso3 + port: 3905 + nodePort: 30224 + - name: mso4 + port: 9990 + nodePort: 30222 + - name: mso5 + port: 8787 + nodePort: 30250 + type: NodePort diff --git a/kubernetes/mso/templates/db-deployment.yaml b/kubernetes/mso/templates/db-deployment.yaml new file mode 100644 index 0000000000..ff1cf75350 --- /dev/null +++ b/kubernetes/mso/templates/db-deployment.yaml @@ -0,0 +1,51 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: mariadb + namespace: {{ .Values.NS }} +spec: + replicas: 1 + selector: + matchLabels: + app: mariadb + template: + metadata: + labels: + app: mariadb + name: mariadb + spec: + hostname: mariadb + containers: + - args: + image: {{ .Values.image.mariadb }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: "mariadb" + env: + - name: MYSQL_ROOT_PASSWORD + value: password + - name: MARIADB_MAJOR + value: "10.1" + - name: MARIADB_VERSION + value: "10.1.11+maria-1~jessie" + volumeMounts: + - mountPath: /etc/mysql/conf.d + name: mso-mariadb-conf + - mountPath: /docker-entrypoint-initdb.d + name: mso-mariadb-docker-entrypoint-initdb + ports: + - containerPort: 3306 + name: mariadb + readinessProbe: + tcpSocket: + port: 3306 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: mso-mariadb-conf + hostPath: + path: /dockerdata-nfs/onap/mso/mariadb/conf.d + - name: mso-mariadb-docker-entrypoint-initdb + hostPath: + path: /dockerdata-nfs/onap/mso/mariadb/docker-entrypoint-initdb.d + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml new file mode 100644 index 0000000000..6f12769d5a --- /dev/null +++ b/kubernetes/mso/templates/mso-deployment.yaml @@ -0,0 +1,76 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: mso + namespace: {{ .Values.NS }} +spec: + replicas: 1 + selector: + matchLabels: + app: mso + template: + metadata: + labels: + app: mso + name: mso + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "mariadb" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "mso-readiness" + } + ]' + spec: + containers: + - command: + - /docker-files/scripts/start-jboss-server.sh + image: {{ .Values.image.mso }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: mso + volumeMounts: + - mountPath: /shared + name: mso + - mountPath: /docker-files + name: mso-docker-files + env: + - name: JBOSS_DEBUG + value: "false" + ports: + - containerPort: 3904 + - containerPort: 3905 + - containerPort: 8080 + - containerPort: 9990 + - containerPort: 8787 + readinessProbe: + tcpSocket: + port: 8080 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: mso + hostPath: + path: /dockerdata-nfs/onap/mso/mso + - name: mso-docker-files + hostPath: + path: /dockerdata-nfs/onap/mso/docker-files + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/mso/values.yaml b/kubernetes/mso/values.yaml new file mode 100644 index 0000000000..41f9677029 --- /dev/null +++ b/kubernetes/mso/values.yaml @@ -0,0 +1,7 @@ +NS: onap-mso +pullPolicy: IfNotPresent +image: + readiness: oomk8s/readiness-check:1.0.0 + mso: nexus3.onap.org:10001/openecomp/mso:1.0-STAGING-latest + mariadb: nexus3.onap.org:10001/mariadb:10.1.11 + -- cgit 1.2.3-korg