Remove apparmor annotations
Remove apparmor annotations. With k8s 1.36+ apparmor is implemented via security_context instead of annotations. Users are expected to add the appropriate values downstream. The htk snippets are in place. Change-Id: I7bc5e965bbbb8d6667702e0879f4a952582f9f89 Signed-off-by: Ritchie, Frank (fr801x) <fr801x@att.com>
This commit is contained in:
@@ -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:
|
||||
|
@@ -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:
|
||||
|
@@ -132,10 +132,6 @@ pod:
|
||||
disruption_budget:
|
||||
controllers:
|
||||
min_available: 0
|
||||
mandatory_access_control:
|
||||
type: apparmor
|
||||
calico-node:
|
||||
calico-node: runtime/default
|
||||
|
||||
dependencies:
|
||||
dynamic:
|
||||
|
@@ -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:
|
||||
|
@@ -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:
|
||||
|
@@ -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/
|
||||
|
@@ -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:
|
||||
|
@@ -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:
|
||||
|
@@ -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:
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user