Skip to content

wip - Vsphere tier1 cleanup#75757

Open
jcpowermac wants to merge 6 commits intoopenshift:mainfrom
jcpowermac:vsphere-tier1-cleanup
Open

wip - Vsphere tier1 cleanup#75757
jcpowermac wants to merge 6 commits intoopenshift:mainfrom
jcpowermac:vsphere-tier1-cleanup

Conversation

@jcpowermac
Copy link
Contributor

No description provided.

…s-vcm

The ref.yaml files for ipi-conf-vsphere-lb-external and
ipi-conf-vsphere-vips-vcm already point to their Python replacements
(.py files). The .sh scripts had deprecation comments stating they
were 'left behind temporarily while we migrate to python' -- the
migration is complete and these files are no longer executed.
Wire up the existing Python replacements for ipi-conf-vsphere-dns and
ipi-deprovision-vsphere-dns by updating their ref.yaml files to point
to the .py scripts instead of .sh. The shell scripts had deprecation
comments but were never actually switched over -- the Python files
already existed but weren't referenced.

Changes to ref.yaml:
- commands: .sh -> .py
- from: tools -> vsphere-ci-python (for boto3 availability)
- add run_as_script: true (required for Python execution)
Merge the VCM (vsphere-elastic) and legacy code paths into a single
script that branches on CLUSTER_PROFILE_NAME. The scripts were ~80%
identical -- the only difference was the iteration source (platform.json
failure domains for VCM vs file-based datacenter/datastore arrays for
legacy).

The shared logic (network validation, OVA import, hw version cloning)
is extracted into an import_ova_and_clone_hw_versions() function to
avoid duplication.

- Remove upi-conf-vsphere-ova-vcm ref and directory
- Remove upi-conf-vsphere-ova-vcm from 13 chain YAML files
- Add vsphere-ibmcloud-ci credentials to consolidated ref.yaml
…ingle step

Merge the VCM (vsphere-elastic) and legacy code paths for IPI
install-config platform generation into a single script that branches
on CLUSTER_PROFILE_NAME.

Key differences preserved in the consolidated script:
- VCM reads VM specs from vault vm-specs.json; legacy hardcodes
- VCM uses dataDisks format with diskSetup; legacy uses additionalDisks
- VCM uses platform.yaml from SHARED_DIR for >= 4.13; legacy constructs inline
- VCM strips path components from cluster/datastore names for < 4.13
- VCM adds journal forwarding MachineConfig manifests
- Legacy supports SIZE_VARIANT 'large'; VCM does not

- Remove ipi-conf-vsphere-vcm ref and directory
- Remove ipi-conf-vsphere-vcm from 6 chain YAML files
- Add DISK_SETUP env var to consolidated ref.yaml
… single step

Merge the VCM and legacy diagnostic collection scripts. Shared code
(metric lists, HTML/JS dashboard template, sosreport collection) is
unified. Path-specific differences are handled via CLUSTER_PROFILE_NAME
branching:

- VCM iterates platform.json vCenters/portgroups; legacy uses single portgroup
- VCM embeds base64 console screenshots in metric JSON and renders in HTML
- VCM collects per-node journal logs from log-gather service
- VCM reads LEASE files from SHARED_DIR; legacy from volumes/__runtime__/shared
- VCM adds VIP/CIDR/NETWORK topology data to HTML summary
- VCM supports FORCE_SOS_REPORT env var
- VCM adds certificate debugging via curl/openssl
- Shared sosreport collection extracted to collect_sosreport() function
- VM/host metric collection extracted to collect_vm_and_host_metrics()

- Remove ipi-deprovision-vsphere-diags-vcm ref and directory
- Remove ipi-deprovision-vsphere-diags-vcm from 4 chain YAML files
- Add FORCE_SOS_REPORT env and vsphere-ibmcloud-ci credentials to ref
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 5, 2026
@openshift-ci openshift-ci bot requested review from gpei and jianlinliu March 5, 2026 16:22
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 5, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jcpowermac
Once this PR has been reviewed and has the lgtm label, please assign jinyunma for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

When VSPHERE_ADDITIONAL_CLUSTER is true, the DNS provisioning and
deprovisioning steps now create and delete Route53 records for a
spoke cluster (hive e2e). The provisioning step also writes
additional_cluster.sh with spoke metadata for downstream consumers.
@openshift-ci-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@jcpowermac: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-ovn-kubernetes-master-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-5.0-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.23-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.22-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.21-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.20-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.19-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.18-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.17-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.16-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.15-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.14-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.13-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.12-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.11-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.10-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.9-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.8-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.7-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-sandbox-release-4.17-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-sandbox-release-4.16-e2e-vsphere-windows openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-master-e2e-vsphere-ovn-techpreview openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-5.0-e2e-vsphere-ovn-techpreview openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.23-e2e-vsphere-ovn-techpreview openshift/ovn-kubernetes presubmit Registry content changed
pull-ci-openshift-ovn-kubernetes-release-4.22-e2e-vsphere-ovn-techpreview openshift/ovn-kubernetes presubmit Registry content changed

A total of 3200 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 5, 2026

@jcpowermac: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants