Browse Source

Merge "Add Docker default AppArmor profile to neutron"

Zuul 1 month ago
parent
commit
ad7b32e4de

+ 1
- 0
neutron/templates/daemonset-dhcp-agent.yaml View File

@@ -46,6 +46,7 @@ spec:
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 48
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
49
+{{ dict "envAll" $envAll "podName" "neutron-dhcp-agent-default" "containerNames" (list "neutron-dhcp-agent-default") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
49 50
     spec:
50 51
 {{ dict "envAll" $envAll "application" "neutron" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
51 52
       serviceAccountName: {{ $serviceAccountName }}

+ 1
- 0
neutron/templates/daemonset-l3-agent.yaml View File

@@ -46,6 +46,7 @@ spec:
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 48
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
49
+{{ dict "envAll" $envAll "podName" "neutron-l3-agent-default" "containerNames" (list "neutron-l3-agent-default") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
49 50
     spec:
50 51
 {{ dict "envAll" $envAll "application" "neutron" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
51 52
       serviceAccountName: {{ $serviceAccountName }}

+ 1
- 0
neutron/templates/daemonset-lb-agent.yaml View File

@@ -46,6 +46,7 @@ spec:
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 48
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
49
+{{ dict "envAll" $envAll "podName" "neutron-lb-agent-default" "containerNames" (list "neutron-lb-agent-default") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
49 50
     spec:
50 51
 {{ dict "envAll" $envAll "application" "neutron" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
51 52
       serviceAccountName: {{ $serviceAccountName }}

+ 1
- 0
neutron/templates/daemonset-metadata-agent.yaml View File

@@ -46,6 +46,7 @@ spec:
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 48
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
49
+{{ dict "envAll" $envAll "podName" "neutron-metadata-agent-default" "containerNames" (list "neutron-metadata-agent-default") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
49 50
     spec:
50 51
 {{ dict "envAll" $envAll "application" "neutron" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
51 52
       serviceAccountName: {{ $serviceAccountName }}

+ 1
- 0
neutron/templates/daemonset-ovs-agent.yaml View File

@@ -46,6 +46,7 @@ spec:
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 48
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
49
+{{ dict "envAll" $envAll "podName" "neutron-ovs-agent-default" "containerNames" (list "neutron-ovs-agent-default") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
49 50
     spec:
50 51
 {{ dict "envAll" $envAll "application" "neutron" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
51 52
       serviceAccountName: {{ $serviceAccountName }}

+ 1
- 0
neutron/templates/daemonset-sriov-agent.yaml View File

@@ -46,6 +46,7 @@ spec:
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 48
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
49
+{{ dict "envAll" $envAll "podName" "neutron-sriov-agent-default" "containerNames" (list "neutron-sriov-agent-default") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
49 50
     spec:
50 51
 {{ dict "envAll" $envAll "application" "neutron" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
51 52
       serviceAccountName: {{ $serviceAccountName }}

+ 14
- 1
neutron/values.yaml View File

@@ -300,6 +300,20 @@ dependencies:
300 300
           service: local_image_registry
301 301
 
302 302
 pod:
303
+  mandatory_access_control:
304
+    type: apparmor
305
+    neutron-dhcp-agent-default:
306
+      neutron-dhcp-agent-default: localhost/docker-default
307
+    neutron-l3-agent-default:
308
+      neutron-l3-agent-default: localhost/docker-default
309
+    neutron-lb-agent-default:
310
+      neutron-lb-agent-default: localhost/docker-default
311
+    neutron-metadata-agent-default:
312
+      neutron-metadata-agent-default: localhost/docker-default
313
+    neutron-ovs-agent-default:
314
+      neutron-ovs-agent-default: localhost/docker-default
315
+    neutron-sriov-agent-default:
316
+      neutron-sriov-agent-default: localhost/docker-default
303 317
   user:
304 318
     neutron:
305 319
       uid: 42424
@@ -502,7 +516,6 @@ pod:
502 516
         limits:
503 517
           memory: "1024Mi"
504 518
           cpu: "2000m"
505
-
506 519
 conf:
507 520
   rally_tests:
508 521
     run_tempest: false

Loading…
Cancel
Save