airship
/
maas
Code Issues Proposed changes

Merge "Enable Docker default AppArmor profile to maas"

This commit is contained in:
Zuul 2020-06-26 16:20:39 +00:00 committed by Gerrit Code Review
parent 843089243b a8a530bec7
commit 749a968d90
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
charts/maas/templates/statefulset-region.yaml
View File

@ -44,7 +44,12 @@ 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" "maas-region" "containerNames" (list "init" "maas-region") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
{{- $containers := "init maas-region" }}
{{- if .Values.conf.cache.enabled }}
{{- $containers = printf "%s maas-cache" $containers }}
{{- end }}
{{- $containers = splitList " " $containers }}
{{ dict "envAll" $envAll "podName" "maas-region" "containerNames" $containers | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
serviceAccountName: {{ $serviceAccountName }}
affinity:

1
charts/maas/values.yaml
View File

@ -319,6 +319,7 @@ pod:
init: runtime/default
maas-region:
maas-region: runtime/default
maas-cache: runtime/default
init: runtime/default
maas-syslog:
syslog: runtime/default