openstack/openstack-helm
Code Issues Proposed changes

Merge "Enable Docker default Apparmor for all Prometheus init Containers"

Browse Source
This commit is contained in:
Zuul 2020-05-06 22:32:34 +00:00 committed by Gerrit Code Review
commit eabe320a99
10 changed files with 10 additions and 5 deletions
prometheus-alertmanager
templates
statefulset.yaml
values_overrides
apparmor.yaml
prometheus-kube-state-metrics
templates
deployment.yaml
values_overrides
apparmor.yaml
prometheus-node-exporter
templates
daemonset.yaml
values_overrides
apparmor.yaml
prometheus-openstack-exporter
templates
deployment.yaml
values_overrides
apparmor.yaml
prometheus-process-exporter
templates
daemonset.yaml
value_overrides
apparmor.yaml

2
prometheus-alertmanager/templates/statefulset.yaml

@ -46,7 +46,7 @@ spec:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
{{ dict "envAll" $envAll "podName" "alertmanager" "containerNames" (list "alertmanager" "alertmanager-perms") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
{{ dict "envAll" $envAll "podName" "alertmanager" "containerNames" (list "alertmanager" "alertmanager-perms" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
{{ dict "envAll" $envAll "application" "server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
serviceAccountName: {{ $serviceAccountName }}

1
prometheus-alertmanager/values_overrides/apparmor.yaml

@ -3,3 +3,4 @@ pod:
type: apparmor
alertmanager:
alertmanager-perms: runtime/default
init: runtime/default

2
prometheus-kube-state-metrics/templates/deployment.yaml

@ -110,7 +110,7 @@ spec:
annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
{{ dict "envAll" $envAll "podName" "kube-state-metrics" "containerNames" (list "kube-state-metrics") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
{{ dict "envAll" $envAll "podName" "kube-state-metrics" "containerNames" (list "kube-state-metrics" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
{{ dict "envAll" $envAll "application" "exporter" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
serviceAccountName: {{ $serviceAccountName }}

1
prometheus-kube-state-metrics/values_overrides/apparmor.yaml

@ -3,3 +3,4 @@ pod:
type: apparmor
kube-state-metrics:
kube-state-metrics: runtime/default
init: runtime/default

2
prometheus-node-exporter/templates/daemonset.yaml

@ -53,7 +53,7 @@ spec:
labels:
{{ tuple $envAll "node_exporter" "metrics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations:
{{ dict "envAll" $envAll "podName" "node-exporter" "containerNames" (list "node-exporter") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
{{ dict "envAll" $envAll "podName" "node-exporter" "containerNames" (list "node-exporter" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
spec:

1
prometheus-node-exporter/values_overrides/apparmor.yaml

@ -3,3 +3,4 @@ pod:
type: apparmor
node-exporter:
node-exporter: runtime/default
init: runrtime/default

2
prometheus-openstack-exporter/templates/deployment.yaml

@ -40,7 +40,7 @@ spec:
labels:
{{ tuple $envAll "prometheus-openstack-exporter" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations:
{{ 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" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
spec:
{{ dict "envAll" $envAll "application" "exporter" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}

1
prometheus-openstack-exporter/values_overrides/apparmor.yaml

@ -3,3 +3,4 @@ pod:
type: apparmor
prometheus-openstack-exporter:
openstack-metrics-exporter: runtime/default
init: runtime/default

2
prometheus-process-exporter/templates/daemonset.yaml

@ -51,7 +51,7 @@ spec:
labels:
{{ tuple $envAll "process_exporter" "metrics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations:
{{ dict "envAll" $envAll "podName" "process-exporter" "containerNames" (list "process-exporter") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
{{ dict "envAll" $envAll "podName" "process-exporter" "containerNames" (list "process-exporter" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
spec:
{{ dict "envAll" $envAll "application" "metrics" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}

1
prometheus-process-exporter/value_overrides/apparmor.yaml

@ -3,3 +3,4 @@ pod:
type: apparmor
process-exporter:
process-exporter: runtime/default
init: runtime/default