From e144129a04e6a4a9be27e64fd00438f0e633ba51 Mon Sep 17 00:00:00 2001 From: vr4manta Date: Thu, 14 May 2026 08:26:30 -0400 Subject: [PATCH] Removed logic that adds the platform-type labels to nodes --- .../virt/ipi-install-vsphere-virt-commands.sh | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/ci-operator/step-registry/ipi/install/vsphere/virt/ipi-install-vsphere-virt-commands.sh b/ci-operator/step-registry/ipi/install/vsphere/virt/ipi-install-vsphere-virt-commands.sh index d30917aa5d1a8..296442d315983 100755 --- a/ci-operator/step-registry/ipi/install/vsphere/virt/ipi-install-vsphere-virt-commands.sh +++ b/ci-operator/step-registry/ipi/install/vsphere/virt/ipi-install-vsphere-virt-commands.sh @@ -37,20 +37,6 @@ function approve_csrs() { done } -# Add 'node.openshift.io/platform-type=vsphere' label to any node that is missing it. -function label_vsphere_nodes() { - echo "$(date -u --rfc-3339=seconds) - Adding labels to vsphere nodes for builds that do not have upstream ccm changes..." - NODES=$(oc get nodes -o name --kubeconfig="${CLUSTER_KUBECONFIG}") - for node in ${NODES}; do - echo "$(date -u --rfc-3339=seconds) - Checking ${node}" - LABEL_FOUND=$(oc get ${node} -o json | jq -r '.metadata.labels | has("node.openshift.io/platform-type")') - if [ "${LABEL_FOUND}" == "false" ]; then - echo "$(date -u --rfc-3339=seconds) - Adding 'node.openshift.io/platform-type=vsphere' label" - oc label "${node}" "node.openshift.io/platform-type"=vsphere --kubeconfig="${CLUSTER_KUBECONFIG}" - fi - done -} - # Enable storage operator / capability. If operator is already enabled, this function will log no changes made and operator is ready. function enable_storage_operator() { echo "$(date -u --rfc-3339=seconds) - Enabling storage capability (operator)..." @@ -111,10 +97,6 @@ function patch_csi_driver_removed() { oc patch clustercsidriver csi.vsphere.vmware.com --type=merge --patch 'spec: {managementState: "Removed"}' } -# We are going to apply the 'node.openshift.io/platform-type=vsphere' label to all existing nodes as a workaround while waiting for upstream CCM changes -# When upstream changes are merged downstream, the function will output that no nodes were updated. -label_vsphere_nodes - # Enable storage operator now that the labels are in place if [ "${ENABLE_HYBRID_STORAGE}" == "true" ]; then enable_storage_operator