Merge "Fluent-logging securityContext"

fluent-logging/templates/deployment-fluentd.yaml

@@ -95,8 +95,6 @@ spec:
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
     spec:
-      securityContext:
-        readOnlyRootFilesystem: true
 {{ dict "envAll" $envAll "application" "fluentd" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
       affinity:
@@ -110,8 +108,7 @@ spec:
         - name: fluentd
 {{ tuple $envAll "fluentd" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.fluentd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-          securityContext:
-            allowPrivilegeEscalation: false
+{{ dict "envAll" $envAll "application" "fluentd" "container" "fluentd" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
           command:
             - /tmp/fluentd.sh
             - start

fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml

@@ -52,8 +52,7 @@ spec:
         - name: fluentd-exporter
 {{ tuple $envAll "prometheus_fluentd_exporter" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.prometheus_fluentd_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-          securityContext:
-            allowPrivilegeEscalation: false
+{{ dict "envAll" $envAll "application" "fluentd_exporter" "container" "fluentd_exporter" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
           command:
             - /tmp/fluentd-exporter.sh
             - start

fluent-logging/values.yaml

@@ -571,11 +571,19 @@ network:
       port: 32329
 
 pod:
-  user:
+  security_context:
     fluentd:
-      uid: 65534
+      pod:
+        runAsUser: 65534
+      container:
+        fluentd:
+          allowPrivilegeEscalation: false
     fluentd_exporter:
-      uid: 65534
+      pod:
+        runAsUser: 65534
+      container:
+        fluentd_exporter:
+          allowPrivilegeEscalation: false
   affinity:
     anti:
       type: