diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml index ad486aec..182cc344 100644 --- a/charts/apiserver-webhook/values.yaml +++ b/charts/apiserver-webhook/values.yaml @@ -202,11 +202,6 @@ network_policy: - {} pod: - mandatory_access_control: - type: apparmor - apiserver-webhook: - apiserver: runtime/default - webhook: runtime/default security_context: apiserver_webhook: pod: diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml index b12bef51..b601a214 100644 --- a/charts/apiserver/values.yaml +++ b/charts/apiserver/values.yaml @@ -271,15 +271,6 @@ endpoints: # key: null pod: - mandatory_access_control: - type: apparmor - kubernetes_apiserver_anchor: - anchor: runtime/default - kube-apiserver: - init: runtime/default - apiserver-key-rotate: runtime/default - apiserver: - apiserver: runtime/default security_context: kubernetes_apiserver_anchor: pod: diff --git a/charts/calico/values.yaml b/charts/calico/values.yaml index 6fc41bd5..18c40e48 100644 --- a/charts/calico/values.yaml +++ b/charts/calico/values.yaml @@ -132,10 +132,6 @@ pod: disruption_budget: controllers: min_available: 0 - mandatory_access_control: - type: apparmor - calico-node: - calico-node: runtime/default dependencies: dynamic: diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml index 71f3b79b..89324b6f 100644 --- a/charts/controller_manager/values.yaml +++ b/charts/controller_manager/values.yaml @@ -77,12 +77,6 @@ dependencies: controller_manager: pod: - mandatory_access_control: - type: apparmor - kubernetes-controller-manager-anchor: - anchor: runtime/default - controller-manager: - controller-manager: runtime/default security_context: kubernetes: pod: diff --git a/charts/coredns/values.yaml b/charts/coredns/values.yaml index 2ad22e57..fb493027 100644 --- a/charts/coredns/values.yaml +++ b/charts/coredns/values.yaml @@ -42,12 +42,6 @@ service: ip: 10.96.0.10 pod: - mandatory_access_control: - type: apparmor - coredns: - coredns: runtime/default - coredns-health: runtime/default - coredns-test: runtime/default security_context: coredns: pod: diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml index de73f30a..f3220ea1 100644 --- a/charts/etcd/values.yaml +++ b/charts/etcd/values.yaml @@ -284,17 +284,6 @@ pod: limits: memory: "1024Mi" cpu: "2000m" - mandatory_access_control: - type: apparmor - # requires override for a specific use case e.g. calico-etcd or kubernetes-etcd - etcd: - etcd: runtime/default - etcd-anchor: - etcdctl: runtime/default - etcd-test: - etcd-test: runtime/default - etcd-backup: - etcd-backup: runtime/default env: etcd: # can be used for tuning, e.g. https://etcd.io/docs/v3.4.0/tuning/ diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml index 950b924c..e82a10fd 100644 --- a/charts/haproxy/values.yaml +++ b/charts/haproxy/values.yaml @@ -67,15 +67,6 @@ endpoints: port: 6553 pod: - mandatory_access_control: - type: apparmor - haproxy-anchor: - haproxy-perms: runtime/default - anchor: runtime/default - kubernetes: - haproxy-haproxy-test: runtime/default - haproxy: - haproxy: runtime/default security_context: haproxy_anchor: pod: diff --git a/charts/promenade/values.yaml b/charts/promenade/values.yaml index a4680b5b..a7060352 100644 --- a/charts/promenade/values.yaml +++ b/charts/promenade/values.yaml @@ -191,14 +191,6 @@ pod: promenade_api_test: readOnlyRootFilesystem: true allowPrivilegeEscalation: false - mandatory_access_control: - type: apparmor - promenade-api: - promenade-util: runtime/default - promenade-api: runtime/default - promenade: - init: runtime/default - promenade-api-test: runtime/default affinity: anti: type: diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml index 9730468a..4cea486b 100644 --- a/charts/scheduler/values.yaml +++ b/charts/scheduler/values.yaml @@ -20,11 +20,6 @@ labels: node_selector_value: enabled pod: - mandatory_access_control: - type: apparmor - scheduler: - anchor: runtime/default - scheduler: runtime/default security_context: scheduler: pod: diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index a3024168..30ecf24c 100644 --- a/examples/containerd/armada-resources.yaml +++ b/examples/containerd/armada-resources.yaml @@ -363,12 +363,6 @@ data: upgrade: no_hooks: true values: - pod: - # Disables AppArmor for the calico-node in the gate - mandatory_access_control: - type: apparmor - calico-node: - calico-node: null conf: cni_network_config: name: k8s-pod-network diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index 1106dc82..2e21146a 100644 --- a/examples/gate/armada-resources.yaml +++ b/examples/gate/armada-resources.yaml @@ -251,12 +251,6 @@ data: upgrade: no_hooks: true values: - pod: - # Disables AppArmor for calico-etcd - mandatory_access_control: - type: apparmor - example-etcd: - etcd: null anchor: etcdctl_endpoint: 10.96.232.136 labels: @@ -369,12 +363,6 @@ data: upgrade: no_hooks: true values: - pod: - # Disables AppArmor for calico - mandatory_access_control: - type: apparmor - calico-node: - calico-node: null conf: cni_network_config: name: k8s-pod-network