Browse Source

Revert "Add Docker default AppArmor profile to neutron"

This reverts commit 584c63c2e9.

Change-Id: I3565f684154432609da2b6b5b4639ee9072b4b76
Chris Wedgwood 1 month ago
parent
commit
3baeefdd37

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

@@ -46,7 +46,6 @@ 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 }}
50 49
     spec:
51 50
 {{ dict "envAll" $envAll "application" "neutron" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
52 51
       serviceAccountName: {{ $serviceAccountName }}

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

@@ -46,7 +46,6 @@ 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 }}
50 49
     spec:
51 50
 {{ dict "envAll" $envAll "application" "neutron" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
52 51
       serviceAccountName: {{ $serviceAccountName }}

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

@@ -46,7 +46,6 @@ 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 }}
50 49
     spec:
51 50
 {{ dict "envAll" $envAll "application" "neutron" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
52 51
       serviceAccountName: {{ $serviceAccountName }}

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

@@ -46,7 +46,6 @@ 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 }}
50 49
     spec:
51 50
 {{ dict "envAll" $envAll "application" "neutron" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
52 51
       serviceAccountName: {{ $serviceAccountName }}

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

@@ -46,7 +46,6 @@ 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 }}
50 49
     spec:
51 50
 {{ dict "envAll" $envAll "application" "neutron" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
52 51
       serviceAccountName: {{ $serviceAccountName }}

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

@@ -46,7 +46,6 @@ 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 }}
50 49
     spec:
51 50
 {{ dict "envAll" $envAll "application" "neutron" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
52 51
       serviceAccountName: {{ $serviceAccountName }}

+ 1
- 14
neutron/values.yaml View File

@@ -300,20 +300,6 @@ 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
317 303
   user:
318 304
     neutron:
319 305
       uid: 42424
@@ -534,6 +520,7 @@ pod:
534 520
         limits:
535 521
           memory: "1024Mi"
536 522
           cpu: "2000m"
523
+
537 524
 conf:
538 525
   rally_tests:
539 526
     run_tempest: false

Loading…
Cancel
Save