Merge "prometheus-openstack-exporter: Add container security context"

prometheus-openstack-exporter/templates/deployment.yaml

@@ -43,8 +43,6 @@ spec:
 {{ dict "envAll" $envAll "podName" "prometheus-openstack-exporter" "containerNames" (list "openstack-metrics-exporter") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
     spec:
-      securityContext:
-        readOnlyRootFilesystem: true
 {{ dict "envAll" $envAll "application" "openstack_exporter" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
       nodeSelector:
@@ -56,8 +54,7 @@ spec:
         - name: openstack-metrics-exporter
 {{ tuple $envAll "prometheus_openstack_exporter" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.prometheus_openstack_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-          securityContext:
-            allowPrivilegeEscalation: false
+{{ dict "envAll" $envAll "application" "openstack_exporter" "container" "openstack_metrics_exporter" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
           command:
             - /tmp/prometheus-openstack-exporter.sh
             - start

prometheus-openstack-exporter/values.yaml

@@ -42,9 +42,14 @@ pod:
     type: apparmor
     openstack-metrics-exporter:
       openstack-metrics-exporter: localhost/docker-default
-  user:
+  security_context:
     openstack_exporter:
-      uid: 65534
+      pod:
+        runAsUser: 65534
+      container:
+        openstack_metrics_exporter:
+          readOnlyRootFilesystem: true
+          allowPrivilegeEscalation: false
   affinity:
     anti:
       type: