Browse Source
Replace seccomp profile docker/default with runtime/default (#6170)
Signed-off-by: Wang Zhen <lazybetrayer@gmail.com>
pull/6147/head
Wang Zhen
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with
25 additions and
25 deletions
-
contrib/metallb/roles/provision/templates/metallb.yml.j2
-
roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
-
roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
-
roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-psp.yml.j2
-
roles/kubernetes-apps/cluster_roles/templates/psp.yml.j2
-
roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/psp-cephfs-provisioner.yml.j2
-
roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-psp.yml.j2
-
roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-psp.yml.j2
-
roles/kubernetes-apps/external_provisioner/rbd_provisioner/templates/psp-rbd-provisioner.yml.j2
-
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/psp-ingress-nginx.yml.j2
-
roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
-
roles/kubernetes-apps/registry/templates/registry-proxy-psp.yml.j2
-
roles/kubernetes-apps/registry/templates/registry-psp.yml.j2
-
roles/network_plugin/flannel/templates/cni-flannel-rbac.yml.j2
|
|
@ -61,8 +61,8 @@ kind: PodSecurityPolicy |
|
|
|
metadata: |
|
|
|
name: metallb |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
{% if apparmor_enabled %} |
|
|
|
apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
|
|
@ -22,7 +22,7 @@ spec: |
|
|
|
labels: |
|
|
|
k8s-app: kube-dns{{ coredns_ordinal_suffix }} |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/pod: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/pod: 'runtime/default' |
|
|
|
spec: |
|
|
|
priorityClassName: system-cluster-critical |
|
|
|
nodeSelector: |
|
|
|
|
|
@ -31,7 +31,7 @@ spec: |
|
|
|
k8s-app: dns-autoscaler{{ coredns_ordinal_suffix }} |
|
|
|
annotations: |
|
|
|
scheduler.alpha.kubernetes.io/critical-pod: "" |
|
|
|
seccomp.security.alpha.kubernetes.io/pod: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/pod: 'runtime/default' |
|
|
|
spec: |
|
|
|
priorityClassName: system-cluster-critical |
|
|
|
securityContext: |
|
|
|
|
|
@ -4,8 +4,8 @@ kind: PodSecurityPolicy |
|
|
|
metadata: |
|
|
|
name: netchecker-agent-hostnet |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
{% if apparmor_enabled %} |
|
|
|
apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
|
|
@ -4,8 +4,8 @@ kind: PodSecurityPolicy |
|
|
|
metadata: |
|
|
|
name: restricted |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default,runtime/default' |
|
|
|
{% if apparmor_enabled %} |
|
|
|
apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
|
|
@ -4,8 +4,8 @@ kind: PodSecurityPolicy |
|
|
|
metadata: |
|
|
|
name: cephfs-provisioner |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
{% if apparmor_enabled %} |
|
|
|
apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
|
|
@ -4,8 +4,8 @@ kind: PodSecurityPolicy |
|
|
|
metadata: |
|
|
|
name: local-path-provisioner |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
{% if apparmor_enabled %} |
|
|
|
apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
|
|
@ -4,8 +4,8 @@ kind: PodSecurityPolicy |
|
|
|
metadata: |
|
|
|
name: local-volume-provisioner |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
{% if apparmor_enabled %} |
|
|
|
apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
|
|
@ -4,8 +4,8 @@ kind: PodSecurityPolicy |
|
|
|
metadata: |
|
|
|
name: rbd-provisioner |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
{% if apparmor_enabled %} |
|
|
|
apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
|
|
@ -4,8 +4,8 @@ kind: PodSecurityPolicy |
|
|
|
metadata: |
|
|
|
name: ingress-nginx |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
{% if apparmor_enabled %} |
|
|
|
apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
|
|
@ -20,7 +20,7 @@ spec: |
|
|
|
app.kubernetes.io/name: metrics-server |
|
|
|
version: {{ metrics_server_version }} |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/pod: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/pod: 'runtime/default' |
|
|
|
spec: |
|
|
|
priorityClassName: system-cluster-critical |
|
|
|
serviceAccountName: metrics-server |
|
|
|
|
|
@ -4,8 +4,8 @@ kind: PodSecurityPolicy |
|
|
|
metadata: |
|
|
|
name: registry-proxy |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
{% if apparmor_enabled %} |
|
|
|
apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
|
|
@ -4,8 +4,8 @@ kind: PodSecurityPolicy |
|
|
|
metadata: |
|
|
|
name: registry |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
{% if apparmor_enabled %} |
|
|
|
apparmor.security.beta.kubernetes.io/defaultProfileName: 'runtime/default' |
|
|
|
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default' |
|
|
|
|
|
@ -10,8 +10,8 @@ kind: PodSecurityPolicy |
|
|
|
metadata: |
|
|
|
name: psp.flannel.unprivileged |
|
|
|
annotations: |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: docker/default |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: docker/default |
|
|
|
seccomp.security.alpha.kubernetes.io/allowedProfileNames: runtime/default |
|
|
|
seccomp.security.alpha.kubernetes.io/defaultProfileName: runtime/default |
|
|
|
{% if podsecuritypolicy_enabled and apparmor_enabled %} |
|
|
|
apparmor.security.beta.kubernetes.io/allowedProfileNames: runtime/default |
|
|
|
apparmor.security.beta.kubernetes.io/defaultProfileName: runtime/default |
|
|
|