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

Jump to bottom

AGENT-990: Allow control planes with 5 and 4 replicas #9154

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AGENT-990: Allow control planes with 5 and 4 replicas #9154

wants to merge 1 commit into from
+362 −4

Conversation

rwsu
Copy link
Contributor

@rwsu rwsu commented Oct 30, 2024

No description provided.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Oct 30, 2024 •
edited by openshift-ci bot
Loading

@rwsu: This pull request references AGENT-990 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 story to target the "4.18.0" version, but no target version was set.

In response to this:

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 Oct 30, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Oct 30, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

The full list of commands accepted by this bot can be found 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

andfasano
andfasano reviewed Oct 30, 2024
View reviewed changes
pkg/asset/agent/installconfig.go Outdated
@@ -214,9 +214,9 @@ func (a *OptionalInstallConfig) validateControlPlaneConfiguration(installConfig
var fieldPath *field.Path

if installConfig.ControlPlane != nil {
if *installConfig.ControlPlane.Replicas != 1 && *installConfig.ControlPlane.Replicas != 3 {
if *installConfig.ControlPlane.Replicas != 1 && *installConfig.ControlPlane.Replicas != 3 && *installConfig.ControlPlane.Replicas != 4 && *installConfig.ControlPlane.Replicas != 5 {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if *installConfig.ControlPlane.Replicas != 1 && *installConfig.ControlPlane.Replicas != 3 && *installConfig.ControlPlane.Replicas != 4 && *installConfig.ControlPlane.Replicas != 5 {
if *installConfig.ControlPlane.Replicas < 1 || *installConfig.ControlPlane.Replicas > 5 ||*installConfig.ControlPlane.Replicas == 2 {

Slightly shorter comparison

andfasano
andfasano reviewed Oct 31, 2024
View reviewed changes
pkg/asset/agent/installconfig.go
@@ -215,9 +215,9 @@ func (a *OptionalInstallConfig) validateControlPlaneConfiguration(installConfig
var fieldPath *field.Path

if installConfig.ControlPlane != nil {
if *installConfig.ControlPlane.Replicas != 1 && *installConfig.ControlPlane.Replicas != 3 {
if *installConfig.ControlPlane.Replicas < 1 || *installConfig.ControlPlane.Replicas > 5 || *installConfig.ControlPlane.Replicas == 2 {
Copy link
Contributor

Choose a reason for hiding this comment

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

(and very likely we'll have to remove the 2 case after #9159 will land)

@rwsu
Copy link
Contributor Author

rwsu commented Oct 31, 2024

/retest-required

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Oct 31, 2024

@rwsu: 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/e2e-agent-compact-ipv4-appliance-diskimage 4a2295a link false /test e2e-agent-compact-ipv4-appliance-diskimage
ci/prow/e2e-agent-compact-ipv4-none-platform 4a2295a link false /test e2e-agent-compact-ipv4-none-platform
ci/prow/e2e-agent-sno-ipv4-pxe 4a2295a link false /test e2e-agent-sno-ipv4-pxe
ci/prow/e2e-agent-compact-ipv4-add-nodes 4a2295a link false /test e2e-agent-compact-ipv4-add-nodes
ci/prow/e2e-agent-sno-ipv6 4a2295a link false /test e2e-agent-sno-ipv6
ci/prow/e2e-agent-ha-dualstack 4a2295a link false /test e2e-agent-ha-dualstack

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.

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

@andfasano andfasano andfasano left review comments

@pawanpinjarkar pawanpinjarkar Awaiting requested review from pawanpinjarkar

Assignees
No one assigned
Labels
jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rwsu @openshift-ci-robot @andfasano