Merge "Fix asdc/sdngc interface robot"

[oom.git] / kubernetes / sdc / templates / sdc-fe.yaml

diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml
index bc1777f..adcec19 100644 (file)
--- a/kubernetes/sdc/templates/sdc-fe.yaml
+++ b/kubernetes/sdc/templates/sdc-fe.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: sdc-fe
   name: sdc-fe
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -62,6 +62,7 @@ spec:
           name: sdc-logs-2
         - mountPath: /root/chef-solo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
           name: sdc-fe-config
+          subPath: FE_2_setup_configuration.rb
         - mountPath: /tmp/logback.xml
           name: sdc-logback
         lifecycle:
@@ -82,36 +83,39 @@ spec:
         volumeMounts:
         - mountPath: /usr/share/filebeat/filebeat.yml
           name: filebeat-conf
+          subPath: filebeat.yml
         - mountPath: /var/log/onap
           name: sdc-logs-2
         - mountPath: /usr/share/filebeat/data
           name: sdc-data-filebeat
       volumes:
         - name: filebeat-conf
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+          configMap:
+           name : sdc-filebeat-configmap
         - name: sdc-logs-2
           emptyDir: {}
         - name: sdc-data-filebeat
           emptyDir: {}
         - name: sdc-logback
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdc/fe/logback.xml
+          configMap:
+           name : sdc-log-fe-configmap
         - name: sdc-sdc-es-es
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
+            path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
         - name: sdc-environments
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
+          configMap:
+            name: sdc-environments-configmap
+            defaultMode: 0755
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime
         - name:  sdc-logs
           hostPath:
-            path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
+            path:  {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/logs
         - name:  sdc-fe-config
-          hostPath:
-            path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-fe/FE_2_setup_configuration.rb
+          configMap:
+            name: sdc-fe-configmap
+            defaultMode: 0755
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}