Fix wrong filebeat config in aai

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

diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index 87861b4..f659392 100644 (file)
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiAaiTraversal }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -12,35 +13,24 @@ spec:
       labels:
         app: aai-traversal
       name: aai-traversal
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "hbase",
-                  "--container-name",
-                  "aai-resources"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "aai-traversal-readiness"
-          }
-        ]'
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - hbase
+        - --container-name
+        - aai-resources
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: aai-traversal-readiness
       containers:
       - name: aai-traversal
         image: "{{ .Values.image.aaiTraversalImage }}:{{ .Values.image.aaiTraversalVersion }}"
@@ -58,8 +48,6 @@ spec:
           value: http://gerrit.onap.org/r/aai
         - name: RESOURCES_HOSTNAME
           value: aai-resources.{{ .Values.nsPrefix }}-aai
-        - name: LOCAL_USER_ID
-          value: "0"
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
@@ -97,7 +85,7 @@ spec:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
       - name: filebeat-conf
         hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
       - name: aai-traversal-logs
         emptyDir: {}
       - name: aai-traversal-filebeat
@@ -116,4 +104,4 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ (.Files.Glob "resources/traversal/conf/logback.xml").AsConfig | indent 2 }}
-
+#{{ end }}