From 6fad54c6164f431b003166e6e0947017b85975ed Mon Sep 17 00:00:00 2001 From: Simone Tiraboschi Date: Tue, 11 Apr 2023 15:29:33 +0200 Subject: [PATCH] [release-1.9] Revert "Disable PSA for upgrades with kv v0.58 on OCP/OKD (#2281)" (#2314) This reverts commit 6adde6252d7c52b2cf00d7e59887fac986a8ad1b. OCP/OKD 4.13 is not enforcing PSA restricted anymore so we can get rid of this. Signed-off-by: stirabos --- hack/upgrade-test-index-image.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hack/upgrade-test-index-image.sh b/hack/upgrade-test-index-image.sh index 74815f7bf6..45db436b80 100755 --- a/hack/upgrade-test-index-image.sh +++ b/hack/upgrade-test-index-image.sh @@ -117,18 +117,6 @@ KUBECTL_BINARY=${CMD} INSTALLED_NAMESPACE=${HCO_NAMESPACE} printOperatorConditio ### Create a VM ### Msg "Create a simple VM on the previous version cluster, before the upgrade" ${CMD} create namespace ${VMS_NAMESPACE} - -###### -# TODO remove this once OCP/OKD 4.13 will not set PSA enforce=restricted by default -# excplitly label vm namespace as priviledged to let our VM start there -# until OCP/OKD will tolerate it can handle it -# We need it only with Kubevirt <= v0.58.z since Kubevirt v0.59.0 correctly works with PSA. -if [[ "${RELEASE_DELTA}" == "2" ]]; then - echo "----- HACK: explicitly disabling PSA enforce=restricted and scc.podSecurityLabelSync" - ${CMD} label namespace ${VMS_NAMESPACE} --overwrite pod-security.kubernetes.io/enforce=privileged security.openshift.io/scc.podSecurityLabelSync=false -fi -###### - ssh-keygen -t ecdsa -f ./hack/test_ssh -q -N "" cat << END > ./hack/cloud-init.sh #!/bin/sh