Skip to content

Commit

Permalink
[release-1.9] Revert "Disable PSA for upgrades with kv v0.58 on OCP/O…
Browse files Browse the repository at this point in the history
…KD (#2281)" (#2314)

This reverts commit 6adde62.

OCP/OKD 4.13 is not enforcing PSA restricted anymore so we can get rid
of this.

Signed-off-by: stirabos <stirabos@redhat.com>
  • Loading branch information
tiraboschi authored Apr 11, 2023
1 parent 0be94a1 commit 6fad54c
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions hack/upgrade-test-index-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6fad54c

Please sign in to comment.