Run all components in one namespace

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

diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml
index 85102a0..e11df7c 100644 (file)
--- a/kubernetes/aai/templates/modelloader-deployment.yaml
+++ b/kubernetes/aai/templates/modelloader-deployment.yaml
@@ -1,9 +1,11 @@
+#{{ if not .Values.disableAaiModelLoaderService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: model-loader-service
-  namespace: "{{ .Values.nsPrefix }}-aai"
+  name: aai-model-loader-service
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.modelLoaderReplicas }}
   selector:
     matchLabels:
       app: model-loader-service
@@ -11,36 +13,64 @@ spec:
     metadata:
       labels:
         app: model-loader-service
-      name: model-loader-service
+      name: aai-model-loader-service
     spec:
       containers:
-      - env:
+      - name: model-loader-service
+        image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}"
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        env:
         - name: CONFIG_HOME
           value: /opt/app/model-loader/config/
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /opt/app/model-loader/config/
-          name: aai-model-loader-config
-        - mountPath: /logs/
+        - mountPath: /opt/app/model-loader/config/model-loader.properties
+          subPath: model-loader.properties
+          name: aai-model-loader-prop-config
+        - mountPath: /opt/app/model-loader/config/auth/
+          name: aai-model-loader-auth-config
+        - mountPath: /var/log/onap
           name: aai-model-loader-logs
-        image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}"
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: model-loader-service
+        - mountPath: /opt/app/model-loader/bundleconfig/etc/logback.xml
+          name: aai-model-loader-log-conf
+          subPath: logback.xml
         ports:
         - containerPort: 8080
         - containerPort: 8443
+      - name: filebeat-onap-aai-model-loader
+        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-model-loader-logs
+        - mountPath: /usr/share/filebeat/data
+          name: aai-model-loader-filebeat
       volumes:
       - name: localtime
         hostPath:
           path: /etc/localtime
-      - name: aai-model-loader-config
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/appconfig/"
+      - name: aai-model-loader-prop-config
+        configMap:
+          name: aai-model-loader-prop-configmap
+      - name: aai-model-loader-auth-config
+        secret:
+          secretName: aai-model-loader-secret
+      - name: filebeat-conf
+        configMap:
+          name: aai-filebeat-configmap
       - name: aai-model-loader-logs
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/logs/"
+        emptyDir: {}
+      - name: aai-model-loader-filebeat
+        emptyDir: {}
+      - name: aai-model-loader-log-conf
+        configMap:
+         name: aai-model-loader-log-configmap
       restartPolicy: Always
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
\ No newline at end of file
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}