openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Enable apparmor to Ceph post-apply pods"

Browse Source
This commit is contained in:
Zuul 2020-07-10 01:03:07 +00:00 committed by Gerrit Code Review
commit 197409be9f
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-osd/templates/job-post-apply.yaml
View File

@ -75,6 +75,9 @@ spec:
metadata: metadata:
labels: labels:
{{ tuple $envAll "ceph-upgrade" "post-apply" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} {{ tuple $envAll "ceph-upgrade" "post-apply" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
{{ dict "envAll" $envAll "podName" "ceph-osd-post-apply" "containerNames" (list "ceph-osd-post-apply" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec: spec:
{{ dict "envAll" $envAll "application" "post_apply" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "post_apply" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}

7
ceph-osd/values_overrides/apparmor.yaml
View File

@ -11,4 +11,11 @@ pod:
ceph-osd-test: ceph-osd-test:
init: runtime/default init: runtime/default
ceph-cluster-helm-test: runtime/default ceph-cluster-helm-test: runtime/default
ceph-osd-post-apply:
ceph-osd-post-apply: runtime/default
init: runtime/default
lifecycle:
upgrades:
daemonsets:
pod_replacement_strategy: OnDelete
... ...