Add option to disable specific deployments

[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 a566b15..d81e567 100644 (file)
--- a/kubernetes/sdc/templates/sdc-fe.yaml
+++ b/kubernetes/sdc/templates/sdc-fe.yaml
@@ -1,10 +1,11 @@
+#{{ if not .Values.disableSdcSdcFe }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   labels:
     app: sdc-fe
   name: sdc-fe
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-sdc"
 spec:
   selector:
     matchLabels:
@@ -63,14 +64,19 @@ spec:
           name: sdc-sdc-es-es
         - mountPath: /root/chef-solo/environments/
           name: sdc-environments
-        - mountPath: /var/lib/jetty/etc/keystore
-          name: sdc-jetty-keystore
         - mountPath: /etc/localtime
           name: sdc-localtime
+          readOnly: true
         - mountPath: /var/lib/jetty/logs
           name: sdc-logs
         - mountPath: /root/chef-solo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
           name: sdc-fe-config
+        - mountPath: /tmp/logback.xml
+          name: sdc-logback
+        lifecycle:
+          postStart:
+            exec:
+              command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/var/lib/jetty/config/catalog-fe/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
         ports:
         - containerPort: 9443
         - containerPort: 8181
@@ -79,24 +85,42 @@ spec:
             port: 8181
           initialDelaySeconds: 5
           periodSeconds: 10
+      - image: {{ .Values.image.filebeat }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: filebeat-onap
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          name: filebeat-conf
+        - 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
+        - name: sdc-logs-2
+          emptyDir: {}
+        - name: sdc-data-filebeat
+          emptyDir: {}
+        - name: sdc-logback
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdc/fe/logback.xml
         - name: sdc-sdc-es-es
           hostPath:
-            path: /dockerdata-nfs/onap/sdc/sdc-es/ES
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
         - name: sdc-environments
           hostPath:
-            path: /dockerdata-nfs/onap/sdc/environments
-        - name: sdc-jetty-keystore
-          hostPath:
-            path: /dockerdata-nfs/onap/sdc/jetty/keystore
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime
         - name:  sdc-logs
           hostPath:
-            path:  /dockerdata-nfs/onap/sdc/logs
+            path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
         - name:  sdc-fe-config
           hostPath:
-            path:  /dockerdata-nfs/onap/sdc/sdc-fe/FE_2_setup_configuration.rb
+            path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-fe/FE_2_setup_configuration.rb
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file