Browse Source

Merge "Add default-docker (enforce) AppArmor profile to nova"

Zuul 1 month ago
parent
commit
b1ecd6ab6b

+ 1
- 0
nova/templates/daemonset-compute.yaml View File

@@ -45,6 +45,7 @@ spec:
45 45
       annotations:
46 46
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
47 47
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
48
+{{ dict "envAll" $envAll "podName" "nova-compute-default" "containerNames" (list "nova-compute-default") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
48 49
     spec:
49 50
       serviceAccountName: {{ $serviceAccountName }}
50 51
 {{ dict "envAll" $envAll "application" "nova" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}

+ 1
- 0
nova/templates/statefulset-compute-ironic.yaml View File

@@ -45,6 +45,7 @@ spec:
45 45
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
46 46
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
47 47
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
48
+{{ dict "envAll" $envAll "podName" "nova-compute-default" "containerNames" (list "nova-compute-default") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
48 49
     spec:
49 50
       serviceAccountName: {{ $serviceAccountName }}
50 51
 {{ dict "envAll" $envAll "application" "nova" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}

+ 4
- 0
nova/values.yaml View File

@@ -1954,6 +1954,10 @@ endpoints:
1954 1954
     namespace: kube-public
1955 1955
 
1956 1956
 pod:
1957
+  mandatory_access_control:
1958
+    type: apparmor
1959
+    nova-compute-default:
1960
+      nova-compute-default: localhost/docker-default
1957 1961
   user:
1958 1962
     nova:
1959 1963
       uid: 42424

Loading…
Cancel
Save