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

OCPBUGS-11701: [release-4.12] CARRY: use "prefer local" for annotated services #1638

Merged

Conversation

ricky-rav
Copy link
Contributor

Backport of #1630 for 4.12.

Clean backport for the hack itself in go-controller/pkg/ovn/controller/services/load_balancer.go, not a clean backport of the unit tests just because:

  • the renaming in the service controller code (c7fd02c#diff-78b8ad08a198fcc889bf29d85c44763617fd5320ca9ff10f88fe107a0d968c29) was not backported to 4.12. The result is simply that LBRule, LB, LBOpts, Addr had to be prefixed with ovnlb.
  • we don't have
    go-controller/pkg/ovn/controller/services/load_balancer_ocphack_test.go in 4.12, so I moved the unit tests to the existing go-controller/pkg/ovn/controller/services/load_balancer_test.go right after the other ocp hack.

Openshift hack: the router service is annotated with "traffic-policy.network.alpha.openshift.io/local-with-fallback" because, while it is defined with externalTrafficPolicy=Local, it expects the CNI to switch to externalTrafficPolicy=Cluster as soon as there are no local endpoints on any given node. SDN does this already, let's do it in OVNK as well to further reduce disruption time to openshift ingress during upgrades.

Co-authored-by: Riccardo Ravaioli rravaiol@redhat.com
Co-authored-by: Surya Seetharaman suryaseetharaman.9@gmail.com
(cherry picked from commit c521311)

Openshift hack: the router service is annotated with "traffic-policy.network.alpha.openshift.io/local-with-fallback" because, while it is defined with externalTrafficPolicy=Local, it expects the CNI to switch to externalTrafficPolicy=Cluster as soon as there are no local endpoints on any given node. SDN does this already, let's do it in OVNK as well to further reduce disruption time to openshift ingress during upgrades.

Co-authored-by: Riccardo Ravaioli <rravaiol@redhat.com>
Co-authored-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
(cherry picked from commit c521311)
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 12, 2023

@ricky-rav: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

CARRY: use "prefer local" for annotated services

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/test-infra repository.

@ricky-rav
Copy link
Contributor Author

/jira cherrypick OCPBUGS-11458

@openshift-ci-robot
Copy link
Contributor

@ricky-rav: Jira Issue OCPBUGS-11458 has been cloned as Jira Issue OCPBUGS-11701. Will retitle bug to link to clone.
/retitle OCPBUGS-11701: CARRY: use "prefer local" for annotated services

In response to this:

/jira cherrypick OCPBUGS-11458

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/test-infra repository.

@openshift-ci openshift-ci bot changed the title CARRY: use "prefer local" for annotated services OCPBUGS-11701: CARRY: use "prefer local" for annotated services Apr 12, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 12, 2023

@ricky-rav: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

OCPBUGS-11701: CARRY: use "prefer local" for annotated services

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/test-infra repository.

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Apr 12, 2023
@openshift-ci-robot
Copy link
Contributor

@ricky-rav: This pull request references Jira Issue OCPBUGS-11701, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.12.z) matches configured target version for branch (4.12.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-11458 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-11458 targets the "4.13.0" version, which is one of the valid target versions: 4.13.0
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

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

In response to this:

Backport of #1630 for 4.12.

Clean backport for the hack itself in go-controller/pkg/ovn/controller/services/load_balancer.go, not a clean backport of the unit tests just because:

  • the renaming in the service controller code (c7fd02c#diff-78b8ad08a198fcc889bf29d85c44763617fd5320ca9ff10f88fe107a0d968c29) was not backported to 4.12. The result is simply that LBRule, LB, LBOpts, Addr had to be prefixed with ovnlb.
  • we don't have
    go-controller/pkg/ovn/controller/services/load_balancer_ocphack_test.go in 4.12, so I moved the unit tests to the existing go-controller/pkg/ovn/controller/services/load_balancer_test.go right after the other ocp hack.

Openshift hack: the router service is annotated with "traffic-policy.network.alpha.openshift.io/local-with-fallback" because, while it is defined with externalTrafficPolicy=Local, it expects the CNI to switch to externalTrafficPolicy=Cluster as soon as there are no local endpoints on any given node. SDN does this already, let's do it in OVNK as well to further reduce disruption time to openshift ingress during upgrades.

Co-authored-by: Riccardo Ravaioli rravaiol@redhat.com
Co-authored-by: Surya Seetharaman suryaseetharaman.9@gmail.com
(cherry picked from commit c521311)

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/test-infra repository.

@ricky-rav ricky-rav changed the title OCPBUGS-11701: CARRY: use "prefer local" for annotated services OCPBUGS-11701: [release-4.12] CARRY: use "prefer local" for annotated services Apr 12, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 12, 2023

@ricky-rav: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Retaining the bugzilla/valid-bug label as it was manually added.

In response to this:

OCPBUGS-11701: [release-4.12] CARRY: use "prefer local" for annotated services

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/test-infra repository.

@ricky-rav
Copy link
Contributor Author

/retest-required

@dcbw
Copy link
Contributor

dcbw commented Apr 12, 2023

/approve
/lgtm

@dcbw dcbw added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Apr 12, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 12, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dcbw, ricky-rav

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 Apr 12, 2023
@jechen0648
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 12, 2023
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 3780f16 and 2 for PR HEAD d4b0b95 in total

@ricky-rav
Copy link
Contributor Author

/retest-required

2 similar comments
@ricky-rav
Copy link
Contributor Author

/retest-required

@ricky-rav
Copy link
Contributor Author

/retest-required

@dcbw
Copy link
Contributor

dcbw commented Apr 14, 2023

/override ci/prow/e2e-vsphere-windows

https://issues.redhat.com/browse/OCPBUGS-11735

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 14, 2023

@dcbw: Overrode contexts on behalf of dcbw: ci/prow/e2e-vsphere-windows

In response to this:

/override ci/prow/e2e-vsphere-windows

https://issues.redhat.com/browse/OCPBUGS-11735

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/test-infra repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 14, 2023

@ricky-rav: The following test 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-vsphere-windows d4b0b95 link true /test e2e-vsphere-windows

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/test-infra repository. I understand the commands that are listed here.

@ricky-rav
Copy link
Contributor Author

/tide refresh

@openshift-merge-robot openshift-merge-robot merged commit d69a62a into openshift:release-4.12 Apr 14, 2023
@openshift-ci-robot
Copy link
Contributor

@ricky-rav: Jira Issue OCPBUGS-11701: All pull requests linked via external trackers have merged:

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

In response to this:

Backport of #1630 for 4.12.

Clean backport for the hack itself in go-controller/pkg/ovn/controller/services/load_balancer.go, not a clean backport of the unit tests just because:

  • the renaming in the service controller code (c7fd02c#diff-78b8ad08a198fcc889bf29d85c44763617fd5320ca9ff10f88fe107a0d968c29) was not backported to 4.12. The result is simply that LBRule, LB, LBOpts, Addr had to be prefixed with ovnlb.
  • we don't have
    go-controller/pkg/ovn/controller/services/load_balancer_ocphack_test.go in 4.12, so I moved the unit tests to the existing go-controller/pkg/ovn/controller/services/load_balancer_test.go right after the other ocp hack.

Openshift hack: the router service is annotated with "traffic-policy.network.alpha.openshift.io/local-with-fallback" because, while it is defined with externalTrafficPolicy=Local, it expects the CNI to switch to externalTrafficPolicy=Cluster as soon as there are no local endpoints on any given node. SDN does this already, let's do it in OVNK as well to further reduce disruption time to openshift ingress during upgrades.

Co-authored-by: Riccardo Ravaioli rravaiol@redhat.com
Co-authored-by: Surya Seetharaman suryaseetharaman.9@gmail.com
(cherry picked from commit c521311)

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/test-infra repository.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.12.0-0.nightly-2023-04-14-233647

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-moderate Referenced Jira bug's severity is moderate 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.