openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Memcached: Add apparmor profile to memcached init containers"

Browse Source
This commit is contained in:
Zuul 2020-05-04 22:12:37 +00:00 committed by Gerrit Code Review
commit 79043176a1
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
memcached/templates/deployment.yaml
View File

@ -39,7 +39,7 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ dict "envAll" $envAll "podName" "memcached" "containerNames" (list "memcached") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} {{ dict "envAll" $envAll "podName" "memcached" "containerNames" (list "init" "memcached") | 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 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
labels: labels:

2
memcached/templates/monitoring/prometheus/exporter-deployment.yaml
View File

@ -41,7 +41,7 @@ spec:
namespace: {{ .Values.endpoints.prometheus_memcached_exporter.namespace }} namespace: {{ .Values.endpoints.prometheus_memcached_exporter.namespace }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
{{ dict "envAll" $envAll "podName" "prometheus_memcached_exporter" "containerNames" (list "memcached-exporter") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} {{ dict "envAll" $envAll "podName" "prometheus_memcached_exporter" "containerNames" (list "init" "memcached-exporter") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec: spec:
{{ dict "envAll" $envAll "application" "memcached_exporter" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "memcached_exporter" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
shareProcessNamespace: true shareProcessNamespace: true

2
memcached/values_overrides/apparmor.yaml
View File

@ -2,8 +2,10 @@ pod:
mandatory_access_control: mandatory_access_control:
type: apparmor type: apparmor
prometheus_memcached_exporter: prometheus_memcached_exporter:
init: runtime/default
memcached-exporter: runtime/default memcached-exporter: runtime/default
memcached: memcached:
init: runtime/default
memcached: runtime/default memcached: runtime/default
monitoring: monitoring: