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 --- kubernetes/aai/templates/aai-deployment.yaml | 89 ++++++++++------------------ 1 file changed, 31 insertions(+), 58 deletions(-) (limited to 'kubernetes/aai/templates/aai-deployment.yaml') diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml index 162fb99bf9..9b55d4e736 100644 --- a/kubernetes/aai/templates/aai-deployment.yaml +++ b/kubernetes/aai/templates/aai-deployment.yaml @@ -13,58 +13,37 @@ spec: 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" - } - ]' + pod.beta.kubernetes.io/init-containers: '[{ + "args": [ + "--container-name", "aai-resources", + "--container-name", "aai-traversal" + ], + "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 }} + - name: aai-service + image: "{{ .Values.image.aaiProxy }}:{{ .Values.image.aaiProxyVersion}}" 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 + - mountPath: /dev/log + name: aai-service-log + - mountPath: /usr/local/etc/haproxy/haproxy.cfg + name: haproxy-cfg ports: - containerPort: 8080 - containerPort: 8443 @@ -74,18 +53,12 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 volumes: - - name: aai-service-certs + - name: aai-service-log hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/etc/ssl/certs/ - - name: aai-service-logroot + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/log/" + - name: haproxy-cfg hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/opt/aai/logroot/ - - name: aai-config - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-config/ - - name: aai-data - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/ + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/haproxy.cfg" restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -- cgit 1.2.3-korg