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

This commit is contained in:
Zuul 2019-03-22 02:22:27 +00:00 committed by Gerrit Code Review
commit f0cbc80d7e
2 changed files with 8 additions and 6 deletions

View File

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

View File

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