X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Ftemplates%2Faai-deployment.yaml;h=a65cf44cba4de5e2802bb1f2c41c6b3e352573da;hb=772191ae39b9932c2e9ab1f0501d89364616d79b;hp=9b55d4e736b37de3b34d30d76be3ce54c55af2ce;hpb=b473f849cd6d94165f95d7fa181fff0aaae1289e;p=oom.git

diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml
index 9b55d4e736..a65cf44cba 100644
--- a/kubernetes/aai/templates/aai-deployment.yaml
+++ b/kubernetes/aai/templates/aai-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiAaiService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -12,34 +13,32 @@ spec:
       labels:
         app: aai-service
       name: aai-service
-      annotations:
-        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:
+      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:
       - name: aai-service
         image: "{{ .Values.image.aaiProxy }}:{{ .Values.image.aaiProxyVersion}}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         - mountPath: /dev/log
           name: aai-service-log
         - mountPath: /usr/local/etc/haproxy/haproxy.cfg
@@ -53,12 +52,16 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
       volumes:
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
         - name: aai-service-log
           hostPath:
-            path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/log/"
+            path: "/dev/log"
         - name: haproxy-cfg
           hostPath:
             path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/haproxy.cfg"
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}