Run all components in one namespace

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

diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml
index a17325c..e73c7b3 100644 (file)
--- a/kubernetes/aai/templates/sparky-be-deployment.yaml
+++ b/kubernetes/aai/templates/sparky-be-deployment.yaml
@@ -1,9 +1,11 @@
+#{{ if not .Values.disableAaiSparkyBe }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: sparky-be
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-sparky-be
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.sparkyReplicas }}
   selector:
     matchLabels:
       app: sparky-be
@@ -11,7 +13,7 @@ spec:
     metadata:
       labels:
         app: sparky-be
-      name: sparky-be
+      name: aai-sparky-be
     spec:
       containers:
       - name: sparky-be
@@ -28,10 +30,35 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /opt/app/sparky/config/
+        - mountPath: /opt/app/sparky/config/auth/
+          name: aai-sparky-be-auth-config
+        - mountPath: /opt/app/sparky/config/synchronizer.properties
+          subPath: synchronizer.properties
           name: aai-sparky-be-config
-        - mountPath: /logs/
+        - mountPath: /opt/app/sparky/config/suggestive-search.properties
+          subPath: suggestive-search.properties
+          name: aai-sparky-be-config
+        - mountPath: /opt/app/sparky/config/search-service.properties
+          subPath: search-service.properties
+          name: aai-sparky-be-config
+        - mountPath: /opt/app/sparky/config/roles.config
+          subPath: roles.config
+          name: aai-sparky-be-config
+        - mountPath: /opt/app/sparky/config/elasticsearch.properties
+          subPath: elasticsearch.properties
+          name: aai-sparky-be-config
+        - mountPath: /opt/app/sparky/config/aai.properties
+          subPath: aai.properties
+          name: aai-sparky-be-config
+        - mountPath: /opt/app/sparky/config/model/
+          name: aai-sparky-be-model-config
+        - mountPath: /opt/app/sparky/config/portal/
+          name: aai-sparky-be-portal-config
+        - mountPath: /var/log/onap
           name: aai-sparky-be-logs
+        - mountPath: /opt/app/sparky/bundleconfig/etc/logback.xml
+          name: aai-sparky-be-log-conf
+          subPath: logback.xml
         ports:
         - containerPort: 9517
         readinessProbe:
@@ -39,16 +66,44 @@ spec:
             port: 9517
           initialDelaySeconds: 5
           periodSeconds: 10
+      - name: filebeat-onap-aai-sparky
+        image: {{ .Values.image.filebeat }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          subPath: filebeat.yml
+          name: filebeat-conf
+        - mountPath: /var/log/onap
+          name: aai-sparky-be-logs
+        - mountPath: /usr/share/filebeat/data
+          name: aai-sparky-filebeat
       volumes:
       - name: localtime
         hostPath:
           path: /etc/localtime
       - name: aai-sparky-be-config
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/sparky-be/appconfig/"
+        configMap:
+          name: aai-sparky-be-configmap
+      - name: aai-sparky-be-model-config
+        configMap:
+          name: aai-sparky-be-model-configmap
+      - name: aai-sparky-be-portal-config
+        configMap:
+          name: aai-sparky-be-portal-configmap
+      - name: aai-sparky-be-auth-config
+        secret:
+          secretName: aai-sparky-be-secret
+      - name: filebeat-conf
+        configMap:
+          name: aai-filebeat-configmap
       - name: aai-sparky-be-logs
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/sparky-be/logs/"
+        emptyDir: {}
+      - name: aai-sparky-filebeat
+        emptyDir: {}
+      - name: aai-sparky-be-log-conf
+        configMap:
+         name: aai-sparky-be-log-configmap
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}