From fdc176253250ac0100a15b0d08fe752e2b5cb701 Mon Sep 17 00:00:00 2001 From: kerenj Date: Thu, 24 Aug 2017 11:32:22 +0000 Subject: aai K8S-Helm Parameterization changed aai k8s deployment to support helm parameterization. Issue-ID: OOM-52 Change-Id: Ifffdb4204a3fdb2c7be62063134c489f8123012d Signed-off-by: kerenj --- kubernetes/aai/templates/aai-deployment.yaml | 91 ++++++++++++++++++++ kubernetes/aai/templates/all-services.yaml | 54 ++++++++++++ kubernetes/aai/templates/hbase-deployment.yaml | 36 ++++++++ .../aai/templates/modelloader-deployment.yaml | 99 ++++++++++++++++++++++ 4 files changed, 280 insertions(+) create mode 100644 kubernetes/aai/templates/aai-deployment.yaml create mode 100644 kubernetes/aai/templates/all-services.yaml create mode 100644 kubernetes/aai/templates/hbase-deployment.yaml create mode 100644 kubernetes/aai/templates/modelloader-deployment.yaml (limited to 'kubernetes/aai/templates') diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml new file mode 100644 index 0000000000..286a9aca53 --- /dev/null +++ b/kubernetes/aai/templates/aai-deployment.yaml @@ -0,0 +1,91 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: aai-service + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: aai-service + template: + metadata: + labels: + app: aai-service + name: aai-service + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "hbase" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "aai-service-readiness" + } + ]' + spec: + containers: + - env: + - name: AAI_REPO_PATH + value: r/aai + - name: AAI_CHEF_ENV + value: simpledemo + - name: AAI_CHEF_LOC + value: /var/chef/aai-data/environments + - name: docker_gitbranch + value: release-1.0.0 + - name: DEBIAN_FRONTEND + value: noninteractive + - name: JAVA_HOME + value: /usr/lib/jvm/java-8-openjdk-amd64 + image: {{ .Values.image.ajscAai }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: aai-service + volumeMounts: + - mountPath: /etc/ssl/certs/ + name: aai-service-certs + - mountPath: /opt/aai/logroot/ + name: aai-service-logroot + - mountPath: /var/chef/aai-config/ + name: aai-config + - mountPath: /var/chef/aai-data/ + name: aai-data + ports: + - containerPort: 8080 + - containerPort: 8443 + readinessProbe: + tcpSocket: + port: 8443 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: aai-service-certs + hostPath: + path: /dockerdata-nfs/onap/aai/etc/ssl/certs/ + - name: aai-service-logroot + hostPath: + path: /dockerdata-nfs/onap/aai/opt/aai/logroot/ + - name: aai-config + hostPath: + path: /dockerdata-nfs/onap/aai/aai-config/ + - name: aai-data + hostPath: + path: /dockerdata-nfs/onap/aai/aai-data/ + restartPolicy: Always + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml new file mode 100644 index 0000000000..4a016f47b5 --- /dev/null +++ b/kubernetes/aai/templates/all-services.yaml @@ -0,0 +1,54 @@ +apiVersion: v1 +kind: Service +metadata: + name: hbase + namespace: {{ .Values.NS }} + labels: + app: hbase +spec: + ports: + - name: "hbase-port" + port: 8020 + selector: + app: hbase + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: aai-service + namespace: {{ .Values.NS }} + labels: + app: aai-service +spec: + ports: + - name: "aai-service-port-8443" + port: 8443 + targetPort: 8443 + nodePort: 30233 + - name: "aai-service-port-8080" + port: 8080 + targetPort: 8080 + nodePort: 30232 + type: NodePort + selector: + app: aai-service +--- +apiVersion: v1 +kind: Service +metadata: + name: model-loader-service + namespace: {{ .Values.NS }} + labels: + app: model-loader-service +spec: + ports: + - name: "model-loader-service-port-8443" + port: 8443 + nodePort: 30229 + - name: "model-loader-service-port-8080" + port: 8080 + nodePort: 30210 + type: NodePort + selector: + app: model-loader-service diff --git a/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml new file mode 100644 index 0000000000..5de7b98e9a --- /dev/null +++ b/kubernetes/aai/templates/hbase-deployment.yaml @@ -0,0 +1,36 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: hbase + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: hbase + template: + metadata: + labels: + app: hbase + name: hbase + spec: + hostname: hbase + volumes: + - name: hbase-opt-data + hostPath: + path: /dockerdata-nfs/onap/aai/hbase/opt/data + containers: + - name: hbase + image: {{ .Values.image.aaiHbase }} + imagePullPolicy: {{ .Values.pullPolicy }} + volumeMounts: + - mountPath: /opt/data/ + name: hbase-opt-data + ports: + - containerPort: 8020 + readinessProbe: + tcpSocket: + port: 8020 + initialDelaySeconds: 5 + periodSeconds: 10 + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml new file mode 100644 index 0000000000..96c9ee1990 --- /dev/null +++ b/kubernetes/aai/templates/modelloader-deployment.yaml @@ -0,0 +1,99 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: model-loader-service + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: model-loader-service + template: + metadata: + labels: + app: model-loader-service + name: model-loader-service + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "aai-service" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "model-loader-readiness" + }, + { + "args": [ + "--container-name", + "sdc-es", + "--container-name", + "sdc-cs", + "--container-name", + "sdc-kb", + "--container-name", + "sdc-be", + "--container-name", + "sdc-fe" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "value": "onap-sdc" + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "model-loader-sdc-readiness" + } + ]' + spec: + containers: + - env: + - name: DISTR_CLIENT_ASDC_ADDRESS + value: sdc-be.onap-sdc:8443 + - name: DISTR_CLIENT_ENVIRONMENT_NAME + value: AUTO + - name: DISTR_CLIENT_USER + value: aai + - name: DISTR_CLIENT_PASSWORD + value: OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp + - name: APP_SERVER_BASE_URL + value: https://aai-service.onap-aai:8443 + - name: APP_SERVER_KEYSTORE_PASSWORD + value: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o + - name: APP_SERVER_AUTH_USER + value: ModelLoader + - name: APP_SERVER_AUTH_PASSWORD + value: OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw + image: {{ .Values.image.modelLoader }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: model-loader-service + ports: + - containerPort: 8080 + - containerPort: 8443 + readinessProbe: + tcpSocket: + port: 8080 + initialDelaySeconds: 5 + periodSeconds: 10 + restartPolicy: Always + imagePullSecrets: + - name: onap-docker-registry-key -- cgit 1.2.3-korg