Skip to content
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

ipi-vsphere: Require min 3 control planes nodes #60488

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −2
Open

ipi-vsphere: Require min 3 control planes nodes #60488

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions ci-operator/step-registry/ipi/conf/vsphere/ipi-conf-vsphere-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,13 @@ VERSION=$(oc adm release info ${TESTING_RELEASE_IMAGE} --output=json | jq -r '.m

set -o errexit

# Ensure at least 3 control planes for vSphere. Single node is not supported.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you will probably need to update ci-operator/step-registry/ipi/conf/vsphere/vcm/ipi-conf-vsphere-vcm-commands.sh as well. we are deprecating this step and its possible your workflow might not even be using it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addressed in d2eff0b

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rvanderp3 Windows jobs in vSphere are using ipi-vsphere-ovn-hybrid-custom-vxlan-port that relies on ipi-conf-vsphere.

are you saying we should move aways from ipi-conf-vsphere?

Copy link
Contributor

@jcpowermac jcpowermac Jan 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is the chain not the step

https://steps.ci.openshift.org/job?org=openshift-priv&repo=windows-machine-config-operator&branch=release-4.17&test=vsphere-e2e-operator

https://steps.ci.openshift.org/chain/ipi-conf-vsphere

Any job that runs in CI [vsphere environment] (not devqe) will use https://steps.ci.openshift.org/reference/ipi-conf-vsphere-vcm

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it, makes sense.

CONTROL_PLANE_REPLICAS=${CONTROL_PLANE_REPLICAS:-3}
if [ "${CONTROL_PLANE_REPLICAS}" -lt 3 ]; then
echo "CONTROL_PLANE_REPLICAS must be at least 3 for vSphere"
exit 1
fi

Z_VERSION=1000

if [ ! -z ${VERSION} ]; then
Expand Down
3 changes: 2 additions & 1 deletion ci-operator/step-registry/ipi/conf/vsphere/ipi-conf-vsphere-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ ref:
- name: CONTROL_PLANE_REPLICAS
default: "3"
documentation: |-
the number of the master nodes for ipi on vsphere cluster.
the number of the master nodes for ipi on vsphere cluster. Minimum required 3. Single Node is not
supported in vSphere.
- name: COMPUTE_NODE_REPLICAS
default: "3"
documentation: |-
Expand Down
7 changes: 7 additions & 0 deletions ci-operator/step-registry/ipi/conf/vsphere/vcm/ipi-conf-vsphere-vcm-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,13 @@ VERSION=$(oc adm release info ${TESTING_RELEASE_IMAGE} --output=json | jq -r '.m

set -o errexit

# Ensure at least 3 control planes for vSphere. Single node is not supported.
CONTROL_PLANE_REPLICAS=${CONTROL_PLANE_REPLICAS:-3}
if [ "${CONTROL_PLANE_REPLICAS}" -lt 3 ]; then
echo "CONTROL_PLANE_REPLICAS must be at least 3 for vSphere"
exit 1
fi

Z_VERSION=1000

if [ ! -z "${VERSION}" ]; then
Expand Down
3 changes: 2 additions & 1 deletion ci-operator/step-registry/ipi/conf/vsphere/vcm/ipi-conf-vsphere-vcm-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ ref:
- name: CONTROL_PLANE_REPLICAS
default: "3"
documentation: |-
the number of the master nodes for ipi on vsphere cluster.
the number of the master nodes for ipi on vsphere cluster. Minimum required 3. Single Node is not
supported in vSphere.
- name: COMPUTE_NODE_REPLICAS
default: "3"
documentation: |-
Expand Down