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

OCPEDGE-1195: Arbiter node support #1366

Merged

Conversation

eggfoobar
Copy link
Contributor

@eggfoobar eggfoobar commented Oct 31, 2024

Per EP: openshift/enhancements#1674

This PR adds the ability of CEO to be able to be aware of the arbiter node in order to correctly deploy an etcd member on an arbiter node. This change bumps ocp/api in order to pull in the new control plane topology of HighlyAvailableArbiter and bumps ocp/library-go in order to use the updated static pod builder that allows for selecting master and arbiter nodes for static pods.

@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 Oct 31, 2024
@openshift-ci openshift-ci bot requested review from dusk125 and hasbro17 October 31, 2024 05:57
@eggfoobar eggfoobar force-pushed the arbiter-node-support branch from af05a05 to 8425218 Compare October 31, 2024 17:25
@eggfoobar eggfoobar changed the title WIP: Arbiter node support WIP: OCPEDGE-1195: Arbiter node support Nov 18, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 18, 2024

@eggfoobar: This pull request references OCPEDGE-1195 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 Nov 18, 2024
@eggfoobar eggfoobar force-pushed the arbiter-node-support branch 3 times, most recently from 79888aa to 4073cbc Compare December 17, 2024 02:23
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 17, 2024

@eggfoobar: This pull request references OCPEDGE-1195 which is a valid jira issue.

In response to this:

Per EP: openshift/enhancements#1674

This PR adds the ability of CEO to be able to be aware of the arbiter node in order to correctly deploy an etcd member on an arbiter node. This change bumps ocp/api in order to pull in the new control plane topology of HighlyAvailableArbiter and bumps ocp/library-go in order to use the updated static pod builder that allows for selecting master and arbiter nodes for static pods.

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.

@eggfoobar eggfoobar changed the title WIP: OCPEDGE-1195: Arbiter node support OCPEDGE-1195: Arbiter node support Dec 17, 2024
@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 Dec 17, 2024
@eggfoobar
Copy link
Contributor Author

/hold

Hold for #1378 to be merged in, so we don't do the dependencies update in this PR

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 17, 2024
Comment on lines 147 to 150
var hasArbiterTopology bool
if infra, err := configClient.ConfigV1().Infrastructures().Get(ctx, ceohelpers.InfrastructureClusterName, metav1.GetOptions{}); err != nil {
return err
} else {
hasArbiterTopology = infra.Status.ControlPlaneTopology == configv1.HighlyAvailableArbiterMode
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh I like that, looks cleaner too, thanks! I did need to keep it an interface client still since we query it before the informers start.

Signed-off-by: ehila <ehila@redhat.com>

feat: updated starter logic to conditionally use the arbiter node

added unit tests for multiselector informer and lister

Signed-off-by: ehila <ehila@redhat.com>
@eggfoobar eggfoobar force-pushed the arbiter-node-support branch from 4073cbc to 4e618bb Compare December 18, 2024 14:57
@eggfoobar
Copy link
Contributor Author

/unhold

Dependency PR has merged in, unholding

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 18, 2024
@tjungblu
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 18, 2024
Copy link
Contributor

openshift-ci bot commented Dec 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eggfoobar, tjungblu

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 Dec 18, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 70a937e and 2 for PR HEAD 4e618bb in total

1 similar comment
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 70a937e and 2 for PR HEAD 4e618bb in total

@tjungblu
Copy link
Contributor

/override ci/prow/e2e-aws-ovn-etcd-scaling

unrelated failure

Copy link
Contributor

openshift-ci bot commented Dec 18, 2024

@tjungblu: Overrode contexts on behalf of tjungblu: ci/prow/e2e-aws-ovn-etcd-scaling

In response to this:

/override ci/prow/e2e-aws-ovn-etcd-scaling

unrelated failure

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.

Copy link
Contributor

openshift-ci bot commented Dec 18, 2024

@eggfoobar: 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-scos-e2e-aws-ovn 4e618bb link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-metal-ovn-ha-cert-rotation-shutdown 4e618bb link false /test e2e-metal-ovn-ha-cert-rotation-shutdown
ci/prow/e2e-aws-etcd-certrotation 4e618bb link false /test e2e-aws-etcd-certrotation
ci/prow/e2e-metal-ovn-sno-cert-rotation-shutdown 4e618bb link false /test e2e-metal-ovn-sno-cert-rotation-shutdown
ci/prow/e2e-aws-etcd-recovery 4e618bb link false /test e2e-aws-etcd-recovery

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 cee7f9b into openshift:master Dec 18, 2024
13 of 18 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: cluster-etcd-operator
This PR has been included in build cluster-etcd-operator-container-v4.19.0-202412190006.p0.gcee7f9b.assembly.stream.el9.
All builds following this will include this PR.

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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants