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.

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

Mgmt-19419: replace HighAvailabilityMode with ControlPlaneCount - phase 1 #2632

Merged
merged 3 commits into from
Feb 25, 2025

Conversation

andrej1991
Copy link
Contributor

@andrej1991 andrej1991 commented Feb 14, 2025

MGMT-19419: it is the first phase of replacing HighAvailabilityMode with ControlPlaneCount. At the moment because assisted-service still uses high-availability-mode some references needs to be kept so the deployment would work.
It depends on openshift/assisted-installer-agent#911.

@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 Feb 14, 2025
Copy link

openshift-ci bot commented Feb 14, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@andrej1991
Copy link
Contributor Author

/cc: @danmanor

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 14, 2025
@andrej1991 andrej1991 force-pushed the MGMT-19419 branch 3 times, most recently from aa7a8e5 to a063420 Compare February 20, 2025 13:01
@andrej1991 andrej1991 changed the title Mgmt 19419: replace HighAvailabilityMode with ControlPlaneCount Mgmt-19419: replace HighAvailabilityMode with ControlPlaneCount Feb 20, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 20, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 20, 2025

@andrej1991: This pull request references Mgmt-19419 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 task to target the "4.19.0" version, but no target version was set.

In response to this:

MGMT-19419: replace HighAvailabilityMode with ControlPlaneCount

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.

Comment on lines 139 to 140
# if self.nodes.masters_count and self.nodes.masters_count > 3:
# extra_vars["control_plane_count"] = self.nodes.masters_count
Copy link
Contributor

Choose a reason for hiding this comment

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

please remove if it's not needed

@@ -95,7 +95,8 @@ class _EnvVariables(DataPool, ABC):
loader=lambda x: bool(strtobool(x)),
default=env_defaults.DEFAULT_USER_MANAGED_NETWORKING,
)
high_availability_mode: EnvVar = EnvVar(default=env_defaults.DEFAULT_HIGH_AVAILABILITY_MODE)
control_plane_count: EnvVar = EnvVar(default=env_defaults.DEFAULT_CONTROL_PLANE_COUNT)
high_availability_mode: EnvVar = EnvVar(default=consts.HighAvailabilityMode.FULL)
Copy link
Contributor

Choose a reason for hiding this comment

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

don't we want to remove high_availability_mode, since you seem to use control_plane_count everywhere now?

Makefile Outdated
@@ -23,7 +23,7 @@ SKIPPER_PARAMS ?= -i

ASSISTED_SERVICE_HOST := $(or ${ASSISTED_SERVICE_HOST},$(shell hostname))

# Openshift CI params
# Openshift CI params
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
# Openshift CI params
# Openshift CI params

nit

@adriengentil
Copy link
Contributor

/cc @danmanor

@openshift-ci openshift-ci bot requested a review from danmanor February 24, 2025 10:56
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 24, 2025

@andrej1991: This pull request references Mgmt-19419 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 task to target the "4.19.0" version, but no target version was set.

In response to this:

MGMT-19419: it is the first phase of replacing HighAvailabilityMode with ControlPlaneCount. At the moment because assisted-service still uses high-availability-mode some references needs to be kept so the deployment would work.
It depends on openshift/assisted-installer-agent#911.

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.

@andrej1991 andrej1991 changed the title Mgmt-19419: replace HighAvailabilityMode with ControlPlaneCount Mgmt-19419: replace HighAvailabilityMode with ControlPlaneCount - phase 1 Feb 24, 2025
@andrej1991 andrej1991 marked this pull request as ready for review February 24, 2025 13:39
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 24, 2025
@openshift-ci openshift-ci bot requested review from eranco74 and rccrdpccl February 24, 2025 13:39
@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 24, 2025
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD ecf96ef and 2 for PR HEAD 34b46e6 in total

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 24, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 25, 2025
Copy link

openshift-ci bot commented Feb 25, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adriengentil, andrej1991

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

Copy link

openshift-ci bot commented Feb 25, 2025

@andrej1991: all tests passed!

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-merge-bot openshift-merge-bot bot merged commit 6681f8e into openshift:master Feb 25, 2025
6 checks passed
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/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants