Merge "Update annotations to spec for aai"

[oom.git] / kubernetes / aai / templates / aai-deployment.yaml

diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml
index 286a9ac..a65cf44 100644 (file)
--- a/kubernetes/aai/templates/aai-deployment.yaml
+++ b/kubernetes/aai/templates/aai-deployment.yaml
@@ -1,8 +1,9 @@
+#{{ if not .Values.disableAaiAaiService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: aai-service
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-aai"
 spec:
   selector:
     matchLabels:
@@ -12,59 +13,36 @@ spec:
       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:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - aai-resources
+        - --container-name
+        - aai-traversal
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: aai-service-readiness
       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: /etc/localtime
+          name: localtime
+          readOnly: true
+        - mountPath: /dev/log
+          name: aai-service-log
+        - mountPath: /usr/local/etc/haproxy/haproxy.cfg
+          name: haproxy-cfg
         ports:
         - containerPort: 8080
         - containerPort: 8443
@@ -74,18 +52,16 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
       volumes:
-        - name: aai-service-certs
-          hostPath:
-            path: /dockerdata-nfs/onap/aai/etc/ssl/certs/
-        - name: aai-service-logroot
+        - name: localtime
           hostPath:
-            path: /dockerdata-nfs/onap/aai/opt/aai/logroot/
-        - name: aai-config
+            path: /etc/localtime
+        - name: aai-service-log
           hostPath:
-            path: /dockerdata-nfs/onap/aai/aai-config/
-        - name: aai-data
+            path: "/dev/log"
+        - name: haproxy-cfg
           hostPath:
-            path: /dockerdata-nfs/onap/aai/aai-data/
+            path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/haproxy.cfg"
       restartPolicy: Always
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}