X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fpolicy%2Ftemplates%2Fdep-pdp.yaml;h=1fda0b6d1ad1e268dffc2847f5a68a8cd334a0f9;hb=refs%2Fchanges%2F39%2F26639%2F2;hp=c8a4f7108a452c0a16b211feebc0101652bb9851;hpb=9d13736f46ce1910c58f93a8423ea23a5a8fa3cf;p=oom.git diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml index c8a4f7108a..1fda0b6d1a 100644 --- a/kubernetes/policy/templates/dep-pdp.yaml +++ b/kubernetes/policy/templates/dep-pdp.yaml @@ -1,3 +1,4 @@ +#{{ if not .Values.disablePolicyPdp }} apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -17,10 +18,6 @@ spec: pod.beta.kubernetes.io/init-containers: '[ { "args": [ - "--container-name", - "mariadb", - "--container-name", - "nexus", "--container-name", "pap" ], @@ -60,11 +57,46 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 volumeMounts: + - mountPath: /etc/localtime + name: localtime + readOnly: true - mountPath: /tmp/policy-install/config name: pe + - mountPath: /var/log/onap + name: policy-logs + - mountPath: /tmp/logback.xml + name: policy-logback + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/opt/app/policy/servers/pdp/webapps/pdp/WEB-INF/classes/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"] + - 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: policy-logs + - mountPath: /usr/share/filebeat/data + name: policy-data-filebeat volumes: + - name: localtime + hostPath: + path: /etc/localtime + - name: filebeat-conf + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + - name: policy-logs + emptyDir: {} + - name: policy-data-filebeat + emptyDir: {} + - name: policy-logback + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/xacml-pdp-rest/logback.xml - name: pe hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file