Skip to content

SPLAT-2592: Removed logic that adds the platform-type labels to nodes for hybrid-env #79296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vr4manta wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −18
Open

SPLAT-2592: Removed logic that adds the platform-type labels to nodes for hybrid-env #79296

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions ci-operator/step-registry/ipi/install/vsphere/virt/ipi-install-vsphere-virt-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)..."
Expand Down Expand Up @@ -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
Expand Down