Skip to content

OCPBUGS-6508: Update Control Plane replica validation for Single Node OpenShift #9048

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.

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

Merged
merged 2 commits into from
May 28, 2025

Conversation

sadasu
Copy link
Contributor

@sadasu sadasu commented Sep 20, 2024

Installer can be used to provision Single Node OpenShift(SNO) only for AWS, GCP, Azure, PowerVS and Baremetal.

SNO is not supported on all on-prem platforms yet. Even on the platforms that support SNO installs, the install method currently supported are assisted/agent/ZTP.

Since, other install methods like ABI (agent based install) layer their install config validation over the Installer's own validation, this validation (that is sensitive to install method) was added while generating manifests in the IPI path.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 20, 2024

@sadasu: This pull request references CORS-3456 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the spike to target the "4.18.0" version, but no target version was set.

In response to this:

Installer can be used to provision Single Node OpenShift(SNO) only for AWS/GCP/Azure.
SNO is not supported on all on-prem platforms yet. Even on the platforms that support SNO installs, the install method currently supported are assisted/agent/ZTP.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 20, 2024
@sadasu sadasu changed the title CORS-3456: Update Control Plane replica validation for Single Node OpenShift OCPBUGS-6508: Update Control Plane replica validation for Single Node OpenShift Sep 20, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Sep 20, 2024
@openshift-ci-robot
Copy link
Contributor

@sadasu: This pull request references Jira Issue OCPBUGS-6508, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Installer can be used to provision Single Node OpenShift(SNO) only for AWS/GCP/Azure.
SNO is not supported on all on-prem platforms yet. Even on the platforms that support SNO installs, the install method currently supported are assisted/agent/ZTP.

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 openshift-eng/jira-lifecycle-plugin repository.

@sadasu
Copy link
Contributor Author

sadasu commented Sep 20, 2024

/test ?

Copy link
Contributor

openshift-ci bot commented Sep 20, 2024

@sadasu: The following commands are available to trigger required jobs:

  • /test altinfra-images
  • /test aro-unit
  • /test artifacts-images
  • /test e2e-agent-compact-ipv4
  • /test e2e-aws-ovn
  • /test e2e-aws-ovn-edge-zones-manifest-validation
  • /test e2e-aws-ovn-upi
  • /test e2e-azure-ovn
  • /test e2e-azure-ovn-upi
  • /test e2e-gcp-ovn
  • /test e2e-gcp-ovn-upi
  • /test e2e-metal-ipi-ovn-ipv6
  • /test e2e-openstack-ovn
  • /test e2e-vsphere-ovn
  • /test e2e-vsphere-ovn-upi
  • /test gofmt
  • /test golint
  • /test govet
  • /test images
  • /test integration-tests
  • /test okd-images
  • /test okd-unit
  • /test okd-verify-codegen
  • /test openstack-manifests
  • /test shellcheck
  • /test terraform-images
  • /test terraform-verify-vendor
  • /test tf-lint
  • /test unit
  • /test verify-codegen
  • /test verify-vendor
  • /test yaml-lint

The following commands are available to trigger optional jobs:

  • /test altinfra-e2e-aws-custom-security-groups
  • /test altinfra-e2e-aws-ovn
  • /test altinfra-e2e-aws-ovn-fips
  • /test altinfra-e2e-aws-ovn-imdsv2
  • /test altinfra-e2e-aws-ovn-localzones
  • /test altinfra-e2e-aws-ovn-proxy
  • /test altinfra-e2e-aws-ovn-shared-vpc
  • /test altinfra-e2e-aws-ovn-shared-vpc-local-zones
  • /test altinfra-e2e-aws-ovn-shared-vpc-wavelength-zones
  • /test altinfra-e2e-aws-ovn-single-node
  • /test altinfra-e2e-aws-ovn-wavelengthzones
  • /test altinfra-e2e-azure-capi-ovn
  • /test altinfra-e2e-azure-ovn-shared-vpc
  • /test altinfra-e2e-gcp-capi-ovn
  • /test altinfra-e2e-gcp-ovn-byo-network-capi
  • /test altinfra-e2e-gcp-ovn-secureboot-capi
  • /test altinfra-e2e-gcp-ovn-xpn-capi
  • /test altinfra-e2e-ibmcloud-capi-ovn
  • /test altinfra-e2e-nutanix-capi-ovn
  • /test altinfra-e2e-openstack-capi-ccpmso
  • /test altinfra-e2e-openstack-capi-ccpmso-zone
  • /test altinfra-e2e-openstack-capi-dualstack
  • /test altinfra-e2e-openstack-capi-dualstack-upi
  • /test altinfra-e2e-openstack-capi-dualstack-v6primary
  • /test altinfra-e2e-openstack-capi-externallb
  • /test altinfra-e2e-openstack-capi-nfv-intel
  • /test altinfra-e2e-openstack-capi-ovn
  • /test altinfra-e2e-openstack-capi-proxy
  • /test altinfra-e2e-vsphere-capi-multi-vcenter-ovn
  • /test altinfra-e2e-vsphere-capi-ovn
  • /test altinfra-e2e-vsphere-capi-static-ovn
  • /test altinfra-e2e-vsphere-capi-zones
  • /test azure-ovn-marketplace-images
  • /test e2e-agent-compact-ipv4-add-nodes
  • /test e2e-agent-compact-ipv4-appliance-diskimage
  • /test e2e-agent-compact-ipv4-none-platform
  • /test e2e-agent-ha-dualstack
  • /test e2e-agent-sno-ipv4-pxe
  • /test e2e-agent-sno-ipv6
  • /test e2e-aws-overlay-mtu-ovn-1200
  • /test e2e-aws-ovn-custom-iam-profile
  • /test e2e-aws-ovn-edge-zones
  • /test e2e-aws-ovn-fips
  • /test e2e-aws-ovn-heterogeneous
  • /test e2e-aws-ovn-imdsv2
  • /test e2e-aws-ovn-proxy
  • /test e2e-aws-ovn-public-ipv4-pool
  • /test e2e-aws-ovn-public-ipv4-pool-disabled
  • /test e2e-aws-ovn-public-subnets
  • /test e2e-aws-ovn-shared-vpc-custom-security-groups
  • /test e2e-aws-ovn-shared-vpc-edge-zones
  • /test e2e-aws-ovn-single-node
  • /test e2e-aws-ovn-techpreview
  • /test e2e-aws-ovn-upgrade
  • /test e2e-aws-ovn-workers-rhel8
  • /test e2e-aws-upi-proxy
  • /test e2e-azure-ovn-resourcegroup
  • /test e2e-azure-ovn-shared-vpc
  • /test e2e-azure-ovn-techpreview
  • /test e2e-azurestack
  • /test e2e-azurestack-upi
  • /test e2e-crc
  • /test e2e-external-aws
  • /test e2e-external-aws-ccm
  • /test e2e-gcp-ovn-byo-vpc
  • /test e2e-gcp-ovn-heterogeneous
  • /test e2e-gcp-ovn-techpreview
  • /test e2e-gcp-ovn-xpn
  • /test e2e-gcp-secureboot
  • /test e2e-gcp-upgrade
  • /test e2e-gcp-upi-xpn
  • /test e2e-ibmcloud-ovn
  • /test e2e-metal-assisted
  • /test e2e-metal-ipi-ovn
  • /test e2e-metal-ipi-ovn-dualstack
  • /test e2e-metal-ipi-ovn-swapped-hosts
  • /test e2e-metal-ipi-ovn-virtualmedia
  • /test e2e-metal-single-node-live-iso
  • /test e2e-nutanix-ovn
  • /test e2e-openstack-ccpmso
  • /test e2e-openstack-ccpmso-zone
  • /test e2e-openstack-dualstack
  • /test e2e-openstack-dualstack-upi
  • /test e2e-openstack-externallb
  • /test e2e-openstack-nfv-intel
  • /test e2e-openstack-proxy
  • /test e2e-powervs-capi-ovn
  • /test e2e-vsphere-multi-vcenter-ovn
  • /test e2e-vsphere-ovn-multi-network
  • /test e2e-vsphere-ovn-techpreview
  • /test e2e-vsphere-ovn-upi-zones
  • /test e2e-vsphere-ovn-zones
  • /test e2e-vsphere-ovn-zones-techpreview
  • /test e2e-vsphere-static-ovn
  • /test okd-e2e-agent-compact-ipv4
  • /test okd-e2e-agent-ha-dualstack
  • /test okd-e2e-agent-sno-ipv6
  • /test okd-e2e-aws-ovn
  • /test okd-e2e-aws-ovn-upgrade
  • /test okd-e2e-gcp
  • /test okd-e2e-gcp-ovn-upgrade
  • /test okd-e2e-vsphere
  • /test okd-scos-images
  • /test tf-fmt

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-installer-master-altinfra-images
  • pull-ci-openshift-installer-master-aro-unit
  • pull-ci-openshift-installer-master-artifacts-images
  • pull-ci-openshift-installer-master-e2e-aws-ovn
  • pull-ci-openshift-installer-master-gofmt
  • pull-ci-openshift-installer-master-golint
  • pull-ci-openshift-installer-master-govet
  • pull-ci-openshift-installer-master-images
  • pull-ci-openshift-installer-master-okd-unit
  • pull-ci-openshift-installer-master-okd-verify-codegen
  • pull-ci-openshift-installer-master-shellcheck
  • pull-ci-openshift-installer-master-tf-fmt
  • pull-ci-openshift-installer-master-tf-lint
  • pull-ci-openshift-installer-master-unit
  • pull-ci-openshift-installer-master-verify-codegen
  • pull-ci-openshift-installer-master-verify-vendor
  • pull-ci-openshift-installer-master-yaml-lint

In response to this:

/test ?

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.

@sadasu
Copy link
Contributor Author

sadasu commented Sep 20, 2024

/test e2e-agent-sno-ipv6

@sadasu
Copy link
Contributor Author

sadasu commented Sep 20, 2024

/retest

@sadasu sadasu force-pushed the sadasu-6508 branch 4 times, most recently from 6befc4c to d5f71a6 Compare September 23, 2024 19:50
@sadasu
Copy link
Contributor Author

sadasu commented Sep 24, 2024

/test e2e-agent-sno-ipv6

@sadasu
Copy link
Contributor Author

sadasu commented Sep 24, 2024

/retest-required

allErrs = append(allErrs, field.Invalid(fldPath.Child("replicas"), pool.Replicas, "number of control plane replicas must be positive"))
case *pool.Replicas == 1 && !supportedSingleNodePlatform(isSingleNodeOpenShift, platform):
allErrs = append(allErrs, field.Invalid(fldPath.Child("replicas"), pool.Replicas, "Single Node OpenShift(SNO) not supported by this install method for this platform"))
case *pool.Replicas != 3:
Copy link
Contributor

Choose a reason for hiding this comment

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

According to the docs (from what I could find), the default is 1 replica but it does not specify a maximum number or a constraint of 3.

https://docs.openshift.com/container-platform/4.16/rest_api/machine_apis/machineset-machine-openshift-io-v1beta1.html

Are we sure that 3 is the constraint here?

Copy link
Member

Choose a reason for hiding this comment

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

Yes.
This has nothing to do with what is valid in the MachineSet API (which is not actually used for control plane Machines) and everything to do with what topologies of OpenShift are supported.

Copy link
Member

Choose a reason for hiding this comment

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

@danmanor FYI - obviously we will expand the range here for 4/5 node control planes when you are ready to support that (if it has to be in this PR, then hopefully in a separate commit so that we could backport the !=3 check if necessary).
Sandhya, please co-ordinate with Dan on the timing and keep @rwsu in the loop on the agent side.

Copy link
Contributor

Choose a reason for hiding this comment

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

@zaneb The diff was removed, what did I missed ?

Copy link
Member

Choose a reason for hiding this comment

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

Previously it was checking that the number of replicas was either 1 or 3: 2145209
Since this didn't land before your changes that check has just been removed.

@sadasu sadasu force-pushed the sadasu-6508 branch 2 times, most recently from 922e097 to abf995e Compare December 16, 2024 16:05
@sadasu sadasu force-pushed the sadasu-6508 branch 2 times, most recently from 39a7252 to 18bfea2 Compare March 11, 2025 20:35
@pawanpinjarkar
Copy link
Contributor

For ABI, for all the platforms ( baremetal, vsphere, none, external) bootstrap-in-place is ignored even if set

if installConfig.BootstrapInPlace != nil && installConfig.BootstrapInPlace.InstallationDisk != "" {
fieldPath := field.NewPath("BootstrapInPlace", "InstallationDisk")
logrus.Warnf(fmt.Sprintf("%s: %s is ignored", fieldPath, installConfig.BootstrapInPlace.InstallationDisk))
}

cc @zaneb

@openshift-ci-robot openshift-ci-robot removed the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Mar 27, 2025
@cybertron
Copy link
Member

LGTM from the perspective of platform support now.

@sadasu
Copy link
Contributor Author

sadasu commented May 20, 2025

@cybertron based on the test https://github.com/openshift/installer/blob/main/pkg/asset/machines/master_test.go#L247, 1 master and 1 worker on BareMetal platform installed with IPI is a supported configuration.

@zaneb
Copy link
Member

zaneb commented May 20, 2025

based on the test https://github.com/openshift/installer/blob/main/pkg/asset/machines/master_test.go#L247, 1 master and 1 worker on BareMetal platform installed with IPI is a supported configuration.

It looks like that was done just to save typing in a test designed to verify something else.

@sadasu sadasu force-pushed the sadasu-6508 branch 2 times, most recently from 14a72dc to 772752a Compare May 21, 2025 20:37
Update test method TestBaremetalGeneratedAssetFiles() to create
a valid Baremetal IPI install config.
@sadasu
Copy link
Contributor Author

sadasu commented May 22, 2025

@cybertron , @zaneb and @patrickdillon Could you PTAL?

@zaneb
Copy link
Member

zaneb commented May 26, 2025

/approve

Copy link
Contributor

openshift-ci bot commented May 26, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zaneb

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

The pull request process is described here

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 26, 2025
@patrickdillon
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 27, 2025
Copy link
Contributor

openshift-ci bot commented May 28, 2025

@sadasu: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-unit 2145209e5a990782edf5a8b60c8da76e128e7b83 link true /test okd-unit
ci/prow/openstack-manifests abf995e1e33aeb97a499f554f8b13eb733f9d29b link true /test openstack-manifests
ci/prow/e2e-azure-ovn abf995e1e33aeb97a499f554f8b13eb733f9d29b link true /test e2e-azure-ovn
ci/prow/e2e-azure-ovn-upi abf995e1e33aeb97a499f554f8b13eb733f9d29b link true /test e2e-azure-ovn-upi
ci/prow/e2e-vsphere-ovn-upi abf995e1e33aeb97a499f554f8b13eb733f9d29b link true /test e2e-vsphere-ovn-upi
ci/prow/e2e-agent-sno-ipv4-pxe 18bfea2d94322f4aef427886dca809b418d352ae link false /test e2e-agent-sno-ipv4-pxe
ci/prow/e2e-agent-compact-ipv4-appliance-diskimage 18bfea2d94322f4aef427886dca809b418d352ae link false /test e2e-agent-compact-ipv4-appliance-diskimage
ci/prow/integration-tests 18bfea2d94322f4aef427886dca809b418d352ae link true /test integration-tests
ci/prow/e2e-azure-ovn-resourcegroup 7629e70 link false /test e2e-azure-ovn-resourcegroup
ci/prow/e2e-vsphere-externallb-ovn 7629e70 link false /test e2e-vsphere-externallb-ovn
ci/prow/e2e-vsphere-ovn-multi-network 7629e70 link false /test e2e-vsphere-ovn-multi-network

Full PR test history. Your PR dashboard.

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.

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD d74a731 and 2 for PR HEAD 7629e70 in total

@openshift-merge-bot openshift-merge-bot bot merged commit 25b5d21 into openshift:main May 28, 2025
15 of 18 checks passed
@openshift-ci-robot
Copy link
Contributor

@sadasu: Jira Issue OCPBUGS-6508: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-6508 has been moved to the MODIFIED state.

In response to this:

Installer can be used to provision Single Node OpenShift(SNO) only for AWS, GCP, Azure, PowerVS and Baremetal.

SNO is not supported on all on-prem platforms yet. Even on the platforms that support SNO installs, the install method currently supported are assisted/agent/ZTP.

Since, other install methods like ABI (agent based install) layer their install config validation over the Installer's own validation, this validation (that is sensitive to install method) was added while generating manifests in the IPI path.

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 openshift-eng/jira-lifecycle-plugin repository.

@sadasu
Copy link
Contributor Author

sadasu commented May 28, 2025

/cherrypick release-4.19

@openshift-cherrypick-robot

@sadasu: #9048 failed to apply on top of branch "release-4.19":

Applying: Update Control Plane replica validation for Single Node OpenShift
Using index info to reconstruct a base tree...
M	pkg/asset/machines/master.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/asset/machines/master.go
CONFLICT (content): Merge conflict in pkg/asset/machines/master.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Update Control Plane replica validation for Single Node OpenShift

In response to this:

/cherrypick release-4.19

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.

@openshift-ci-robot
Copy link
Contributor

@sadasu: Jira Issue OCPBUGS-6508 has been cloned as Jira Issue OCPBUGS-56811. Will retitle bug to link to clone.
/retitle OCPBUGS-56811: OCPBUGS-6508: Update Control Plane replica validation for Single Node OpenShift

In response to this:

/jira cherrypick OCPBUGS-6508

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot changed the title OCPBUGS-6508: Update Control Plane replica validation for Single Node OpenShift OCPBUGS-56811: OCPBUGS-6508: Update Control Plane replica validation for Single Node OpenShift May 28, 2025
@openshift-ci-robot
Copy link
Contributor

@sadasu: Jira Issue OCPBUGS-56811: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-56811 has been moved to the MODIFIED state.

In response to this:

Installer can be used to provision Single Node OpenShift(SNO) only for AWS, GCP, Azure, PowerVS and Baremetal.

SNO is not supported on all on-prem platforms yet. Even on the platforms that support SNO installs, the install method currently supported are assisted/agent/ZTP.

Since, other install methods like ABI (agent based install) layer their install config validation over the Installer's own validation, this validation (that is sensitive to install method) was added while generating manifests in the IPI path.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer
This PR has been included in build ose-installer-container-v4.20.0-202505281454.p0.g25b5d21.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-baremetal-installer
This PR has been included in build ose-baremetal-installer-container-v4.20.0-202505281454.p0.g25b5d21.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-artifacts
This PR has been included in build ose-installer-artifacts-container-v4.20.0-202505281454.p0.g25b5d21.assembly.stream.el9.
All builds following this will include this PR.

@sadasu sadasu changed the title OCPBUGS-56811: OCPBUGS-6508: Update Control Plane replica validation for Single Node OpenShift OCPBUGS-6508: Update Control Plane replica validation for Single Node OpenShift May 28, 2025
@openshift-ci-robot
Copy link
Contributor

@sadasu: Jira Issue OCPBUGS-6508 is in an unrecognized state (ON_QA) and will not be moved to the MODIFIED state.

In response to this:

Installer can be used to provision Single Node OpenShift(SNO) only for AWS, GCP, Azure, PowerVS and Baremetal.

SNO is not supported on all on-prem platforms yet. Even on the platforms that support SNO installs, the install method currently supported are assisted/agent/ZTP.

Since, other install methods like ABI (agent based install) layer their install config validation over the Installer's own validation, this validation (that is sensitive to install method) was added while generating manifests in the IPI path.

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 openshift-eng/jira-lifecycle-plugin repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants