From: Mike Elliott Date: Wed, 17 Apr 2019 18:35:02 +0000 (+0000) Subject: Merge "Allow dr-node containers to run as non-root" X-Git-Tag: 4.0.0-ONAP~218 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ab4a2f57d51b76a94ff5dd2c6c6cc7560032c054;hp=-c;p=oom.git Merge "Allow dr-node containers to run as non-root" --- ab4a2f57d51b76a94ff5dd2c6c6cc7560032c054 diff --combined kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml index 79e07a9bf0,de3324fe19..a508886f10 --- a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml @@@ -45,6 -45,15 +45,15 @@@ spec fieldRef: apiVersion: v1 fieldPath: metadata.namespace + - name: {{ include "common.name" . }}-permission-fixer + image: "{{ .Values.global.busyBoxRepository }}/{{ .Values.global.busyBoxImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + volumeMounts: + - mountPath: {{ .Values.persistence.spoolPath }} + name: {{ include "common.fullname" . }}-spool-data-pvc + - mountPath: {{ .Values.persistence.eventLogsPath }} + name: {{ include "common.fullname" . }}-event-logs-pvc + command: ["chown","-Rf","1000:1001", "/opt/app/datartr"] containers: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" @@@ -100,7 -109,7 +109,7 @@@ {{ toYaml .Values.affinity | indent 10 }} {{- end }} # Filebeat sidecar container - - name: {{ include "common.fullname" . }}-filebeat-onap + - name: {{ include "common.name" . }}-filebeat-onap image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: @@@ -139,7 -148,7 +148,7 @@@ name: {{ include "common.fullname" . }}-log - name: {{ include "common.fullname" . }}-filebeat-conf configMap: - name: {{ include "common.fullname" . }}-dmaap-filebeat-configmap + name: {{ .Release.Name }}-dmaap-filebeat-configmap - name: {{ include "common.fullname" . }}-data-filebeat emptyDir: {} - name: {{ include "common.fullname" . }}-event-logs-pvc