From 4b881972b63ab1c08a5ad4946a8550572f8f066d Mon Sep 17 00:00:00 2001 From: Mandeep Khinda Date: Wed, 30 Aug 2017 14:24:02 +0000 Subject: AAI 1.1 K8s templates and aelm branch merge commit 8a32c4269a6d1dcdcdee6c2548043639754db936 Author: yuryn Date: Mon Aug 28 14:45:23 2017 +0300 Add dependencies to aai-deployment 1. Add to aai-deployment dependency in aai-resources and aai-traversal 2. Fix readiness ports for data-router and sparky-be Change-Id: Icfcd4685ac3cad8e463b5f8176b28f51890d1e38 Issue-ID: OOM-65 Signed-off-by: yuryn commit 34b6e617ca961b6a6df85e88daf122c7cd4195af Author: yuryn Date: Sun Aug 27 20:25:29 2017 +0300 Add AAI haproxy 1. Add AAI haproxy 2. Create aai-resources and aai-traversal log dirs Change-Id: Ib60cc7e482cafe2f1185db7bead181f929165ed3 Issue-ID: OOM-65 Signed-off-by: yuryn commit 82417bcba69cc126a811605e7e577941c6c5eb2e Author: yuryn Date: Thu Aug 24 14:08:30 2017 +0300 Fix aai-model-loader-logs 1. Create aai/model-loader/logs folder in config-init 2. Fix aai-model-loader-logs volume name Change-Id: Ib66b8a226be9f5c42b06e6e7a239af081ad6d874 Issue-ID: OOM-65 Signed-off-by: yuryn commit 441adcffd7041266378ae251f36592da5a44f2c2 Author: yuryn Date: Mon Aug 21 17:18:42 2017 +0300 [WIP] Add new AAI configuration files Addressed review comments: 1. Use k8s lookup names for host names 2. Use existing /opt/data/hdfs-data-name folder 3. Remove redundant entries in yaml files Change-Id: Ied5f559aebc89c9a22b3e5228e6625af86646b5f Issue-ID: OOM-65 Signed-off-by: yuryn commit 0473270da932e4bbf596007fd8fb7ec3cba4e1cc Author: yuryn Date: Sun Aug 20 18:48:51 2017 +0300 Add gremlin and ES services Issue-ID: OOM-65 Change-Id: I3e879418a1258716db1633676cf66bb9620c2b5f Signed-off-by: yuryn commit 0b1332938385cc534b1f034b73f19c145ead87c6 Author: Munir Ahmad Date: Tue Aug 15 15:36:46 2017 -0400 onap 1.1 deployment files work in progress... issue-id: OOM-66 Change-Id: If6553647343bb07464e8cc8556223f0c7a01f134 Signed-off-by: Munir Ahmad Issue-ID: OOM-65 Change-Id: I4afc3d2457a27791ba72f959c82d791b50e02eb2 Signed-off-by: Mandeep Khinda Signed-off-by: yuryn Signed-off-by: Munir Ahmad Signed-off-by: Eric Au Signed-off-by: ronakvy --- .../aai/templates/modelloader-deployment.yaml | 89 ++++------------------ 1 file changed, 15 insertions(+), 74 deletions(-) (limited to 'kubernetes/aai/templates/modelloader-deployment.yaml') diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml index f7d855bbf9..5391273d9d 100644 --- a/kubernetes/aai/templates/modelloader-deployment.yaml +++ b/kubernetes/aai/templates/modelloader-deployment.yaml @@ -12,88 +12,29 @@ spec: 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": "{{ .Values.nsPrefix }}-sdc" - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "model-loader-sdc-readiness" - } - ]' spec: containers: - env: - - name: DISTR_CLIENT_ASDC_ADDRESS - value: sdc-be.{{ .Values.nsPrefix }}-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.{{ .Values.nsPrefix }}-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 }} + - name: CONFIG_HOME + value: /opt/app/model-loader/config/ + volumeMounts: + - mountPath: /opt/app/model-loader/config/ + name: aai-model-loader-config + - mountPath: /logs/ + name: aai-model-loader-logs + image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}" imagePullPolicy: {{ .Values.pullPolicy }} name: model-loader-service ports: - containerPort: 8080 - containerPort: 8443 - readinessProbe: - tcpSocket: - port: 8080 - initialDelaySeconds: 5 - periodSeconds: 10 + volumes: + - name: aai-model-loader-config + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/appconfig/" + - name: aai-model-loader-logs + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/logs/" restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -- cgit 1.2.3-korg