From 925628b627a8c86f259519ea7dc3b0742eb3226f Mon Sep 17 00:00:00 2001 From: Spyros Trigazis Date: Mon, 9 Sep 2019 13:47:23 +0000 Subject: [PATCH] k8s_fedora_atomic: Add PodSecurityPolicy For moving to 1.15.x and beyond we need to have PSP for privileged pods. flannel, calico and node-problem-detector need it. PSP story: 2006515 task: 36513 Allow-priv story: 2006252 task: 35867 Change-Id: I306a249afb275fdbd71354ed75043ffc4d466304 Signed-off-by: Spyros Trigazis (cherry picked from commit 7267c1ea43b72849ece0bedb0a18bfc438829354) (cherry picked from commit 6762a97439ac8feeac05db5b49ac26498c1f0e95) --- .../fragments/configure-kubernetes-master.sh | 1 + .../kube-apiserver-to-kubelet-role.sh | 72 ++++++++++++++++++- .../podsecuritypolicy-2400063d73524e06.yaml | 6 ++ 3 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/podsecuritypolicy-2400063d73524e06.yaml diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh index bdf7b232fa..b7b8da6e10 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh @@ -87,6 +87,7 @@ sed -i ' ' /etc/kubernetes/config KUBE_API_ARGS="--runtime-config=api/all=true" +KUBE_API_ARGS="$KUBE_API_ARGS --allow-privileged=$KUBE_ALLOW_PRIV" KUBE_API_ARGS="$KUBE_API_ARGS --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP" KUBE_API_ARGS="$KUBE_API_ARGS $KUBEAPI_OPTIONS" if [ "$TLS_DISABLED" == "True" ]; then diff --git a/magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh b/magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh index 449acaf8ef..784bea45fe 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh @@ -3,8 +3,8 @@ step="kube-apiserver-to-kubelet-role" printf "Starting to run ${step}\n" +set +x . /etc/sysconfig/heat-params - set -x echo "Waiting for Kubernetes API..." @@ -81,6 +81,76 @@ EOF kubectl apply --validate=false -f ${ADMIN_RBAC} +POD_SECURITY_POLICIES=/srv/magnum/kubernetes/podsecuritypolicies.yaml +# Pod Security Policies +[ -f ${POD_SECURITY_POLICIES} ] || { + echo "Writing File: $POD_SECURITY_POLICIES" + mkdir -p $(dirname ${POD_SECURITY_POLICIES}) + cat > ${POD_SECURITY_POLICIES} <