From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Tue, 8 Mar 2022 15:27:26 +0000 (+0000)
Subject: Merge "[DMAAP] Add pod security context to MR and others"
X-Git-Tag: 10.0.0~104
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=7b9f363158f544a3dc9097d8c3753e6a3b29b764;hp=-c

Merge "[DMAAP] Add pod security context to MR and others"
---

7b9f363158f544a3dc9097d8c3753e6a3b29b764
diff --combined kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
index 2bfa496bcd,bda25508bd..69f6fc1d6e
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
@@@ -23,8 -23,12 +23,12 @@@ spec
    template:
      metadata: {{- include "common.templateMetadata" . | nindent 6 }}
      spec:
+       {{ include "common.podSecurityContext" . | indent 6 | trim}}
        initContainers: {{ include "common.certInitializer.initContainer" . | nindent 8 }}
          - name: {{ include "common.name" . }}-readiness
+           securityContext:
+             runAsUser: 100
+             runAsGroup: 65533
            image: {{ include "repositoryGenerator.image.readiness" . }}
            imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
            command:
@@@ -39,6 -43,8 +43,8 @@@
                  apiVersion: v1
                  fieldPath: metadata.namespace
          - name: {{ include "common.name" . }}-permission-fixer
+           securityContext:
+             runAsUser: 0
            image: {{ include "repositoryGenerator.image.busybox" . }}
            imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
            volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }}
@@@ -79,7 -85,7 +85,7 @@@
              name: {{ include "common.fullname" . }}-log-conf
              subPath: logback.xml
            - mountPath: {{ .Values.global.loggingDirectory }}
 -            name: {{ include "common.fullname" . }}-logs
 +            name: logs
            resources: {{ include "common.resources" . | nindent 12 }}
          {{- if .Values.nodeSelector }}
          nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
@@@ -106,7 -112,7 +112,7 @@@
            configMap:
              name: {{ include "common.fullname" . }}-log
          {{ include "common.log.volumes" . | nindent 8 }}
 -        - name:  {{ include "common.fullname" . }}-logs
 +        - name: logs
            emptyDir: {}
        {{- if not .Values.persistence.enabled }}
          - name:  {{ include "common.fullname" . }}-event-logs
diff --combined kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
index b7acbc9d8d,51045afae9..325ca9f2a7
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
@@@ -34,9 -34,13 +34,13 @@@ spec
          app: {{ include "common.name" . }}
          release: {{ include "common.release" . }}
      spec:
+       {{ include "common.podSecurityContext" . | indent 6 | trim}}
        hostname: {{ .Values.global.dmaapDrProvName }}
        initContainers:
          - name: {{ include "common.name" . }}-readiness
+           securityContext:
+             runAsUser: 100
+             runAsGroup: 65533
            image: {{ include "repositoryGenerator.image.readiness" . }}
            imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
            command:
@@@ -55,6 -59,8 +59,8 @@@
          {{ include "common.certInitializer.initContainer" . | nindent 8 }}
  
          - name: {{ include "common.name" . }}-permission-fixer
+           securityContext:
+             runAsUser: 0
            image: {{ include "repositoryGenerator.image.busybox" . }}
            imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
            volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }}
@@@ -95,7 -101,7 +101,7 @@@
              name: {{ include "common.fullname" . }}-log-conf
              subPath: logback.xml
            - mountPath: {{ .Values.global.loggingDirectory }}
 -            name: {{ include "common.fullname" . }}-logs
 +            name: logs
            resources:
  {{ include "common.resources" . }}
          {{- if .Values.nodeSelector }}
@@@ -123,7 -129,7 +129,7 @@@
          configMap:
            name: {{ include "common.fullname" . }}-log
        {{ include "common.log.volumes" . | nindent 6 }}
 -      - name:  {{ include "common.fullname" . }}-logs
 +      - name: logs
          emptyDir: {}
        imagePullSecrets:
        - name: "{{ include "common.namespace" . }}-docker-registry-key"