openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Add Docker default AppArmor profile to memcached chart"

Browse Source
This commit is contained in:
Zuul 2020-02-14 01:13:53 +00:00 committed by Gerrit Code Review
commit 26982ca705
3 changed files with 12 additions and 1 deletions
memcached
templates
deployment.yaml
monitoring/prometheus
exporter-deployment.yaml
values_overrides
apparmor.yaml

2
memcached/templates/deployment.yaml

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

4
memcached/templates/monitoring/prometheus/exporter-deployment.yaml

@ -39,6 +39,10 @@ spec:
labels:
{{ tuple $envAll "prometheus_memcached_exporter" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
namespace: {{ .Values.endpoints.prometheus_memcached_exporter.namespace }}
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" "prometheus_memcached_exporter" "containerNames" (list "memcached-exporter") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
{{ dict "envAll" $envAll "application" "memcached_exporter" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
shareProcessNamespace: true

7
memcached/values_overrides/apparmor.yaml Normal file

@ -0,0 +1,7 @@
pod:
mandatory_access_control:
type: apparmor
prometheus_memcached_exporter:
memcached-exporter: runtime/default
memcached:
memcached: runtime/default