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-33421: [release-4.13] Full implementation of KEP-1669 ProxyTerminatingEndpoints + ETP=local fix #2130

Merged

Conversation

ricky-rav
Copy link
Contributor

@ricky-rav ricky-rav commented Apr 17, 2024

Differences from 4.14 backport (#2128):

I had to backport two relevant commits from last year that hadn't been backported to 4.13.

[commit 1] Consider serving endpoints in hasLocalHostNetworkEndpoints 8f0bfab

  • no conflicts

[commit 2] Cleanup of endpoint handling functions 8c7ea95

  • conflict between old and new code of GetLbEndpoints -> applied new code
  • conflict with new tests for GetLbEndpointsL: applied new code

[commit 3] Full implementation of KEP-1669 ProxyTerminatingEndpoints

$ git cherry-pick -x f9185969ae241916687699048e291f1c803e8843
Auto-merging go-controller/pkg/node/default_node_network_controller.go
Auto-merging go-controller/pkg/node/gateway_shared_intf.go
Auto-merging go-controller/pkg/util/kube.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/kube.go
Auto-merging go-controller/pkg/util/kube_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/kube_test.go
error: could not apply f9185969a... Full implementation of KEP-1669 ProxyTerminatingEndpoints
  • go-controller/pkg/util/kube.go: conflict between old and new code of GetLbEndpoints -> applied new code
  • go-controller/pkg/util/kube_test.go: conflict with new tests for GetLbEndpoints: applied new code

[commit 4] Fix endpoint selection for externalTrafficPolicy=local

$ git cherry-pick -x 21431f2032627da4907186c2d83a21fc8ca6c1d1
Auto-merging go-controller/pkg/node/gateway_shared_intf.go
Auto-merging go-controller/pkg/ovn/controller/services/lb_config.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/lb_config.go
Auto-merging go-controller/pkg/ovn/controller/services/lb_config_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/lb_config_test.go
Auto-merging go-controller/pkg/ovn/controller/services/load_balancer_ocphack_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/load_balancer_ocphack_test.go
Auto-merging go-controller/pkg/ovn/controller/services/node_tracker.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/node_tracker.go
Auto-merging go-controller/pkg/ovn/controller/services/services_controller.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/services_controller.go
Auto-merging go-controller/pkg/ovn/controller/services/services_controller_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/services_controller_test.go
Auto-merging go-controller/pkg/util/kube.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/kube.go
Auto-merging go-controller/pkg/util/kube_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/kube_test.go
error: could not apply 21431f203... Fix endpoint selection for externalTrafficPolicy=local
  • lb_config_test.go:

    • Since edc3a34 wasn't backported to 4.13, the unit test for recently unidled services (< grace period of 30s) should show EmptyLBEvents: false.
  • go-controller/pkg/node/healthcheck_service.go

    • Because 2fb43e1 wasn't in 4.13 when my commit merged, git suggested restoring the code from before the linked commit, which I rejected.
  • go-controller/pkg/node/gateway_localnet_linux_test.go

    • added node name to endpoints in unit tests (failing otherwise)
  • go-controller/pkg/node/healthcheck_service.go

    • removed unused hasLocalHostNetworkEndpoints
  • go-controller/pkg/ovn/controller/services/lb_config.go

    • minor adjustments due to where some config variables are defined (HostMasqueradeIP)
  • go-controller/pkg/ovn/controller/services/load_balancer_ocphack_test.go**

    • Applied the file, since we need the OCP hacks
  • go-controller/pkg/util/kube.go

    • Had to remove LbEndpoints and GetLbEndpoints from the code, as done in the original commit
  • go-controller/pkg/ovn/controller/services/node_tracker.go**

    • l3gatewayAddressesStr from 4.14 replaced nodeSubnets in 4.13 (from another commit): I kept nodeSubnets and updated the code to call nodeSubnets
    • removed references to OVN zones in newNodeTracker, since 4.13 has no zone support
  • go-controller/pkg/ovn/controller/services/services_controller.go

    • small conflict just because I rearranged the call to buildTemplateLBs on one line instead of being split into two

@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 Apr 17, 2024
@openshift-ci openshift-ci bot requested review from dcbw and tssurya April 17, 2024 17:55
@ricky-rav
Copy link
Contributor Author

/payload nightly

Copy link
Contributor

openshift-ci bot commented Apr 19, 2024

@ricky-rav: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@ricky-rav
Copy link
Contributor Author

/test unit

@ricky-rav ricky-rav changed the title [WIP] [WIP][release-4.13] Full implementation of KEP-1669 ProxyTerminatingEndpoints + ETP=local fix Apr 19, 2024
@ricky-rav
Copy link
Contributor Author

/retest

@ricky-rav ricky-rav force-pushed the kep-1669-bis_413 branch 4 times, most recently from cc29fe7 to 161d5a8 Compare May 2, 2024 18:24
@ricky-rav
Copy link
Contributor Author

/retest

@ricky-rav ricky-rav changed the title [WIP][release-4.13] Full implementation of KEP-1669 ProxyTerminatingEndpoints + ETP=local fix [release-4.13] Full implementation of KEP-1669 ProxyTerminatingEndpoints + ETP=local fix May 3, 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 May 3, 2024
@jcaamano
Copy link
Contributor

jcaamano commented May 8, 2024

/jira cherrypick OCPBUGS-32319

@openshift-ci-robot
Copy link
Contributor

@jcaamano: Jira Issue OCPBUGS-32319 has been cloned as Jira Issue OCPBUGS-33421. Will retitle bug to link to clone.
/retitle OCPBUGS-33421: [release-4.13] Full implementation of KEP-1669 ProxyTerminatingEndpoints + ETP=local fix

In response to this:

/jira cherrypick OCPBUGS-32319

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 [release-4.13] Full implementation of KEP-1669 ProxyTerminatingEndpoints + ETP=local fix OCPBUGS-33421: [release-4.13] Full implementation of KEP-1669 ProxyTerminatingEndpoints + ETP=local fix May 8, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 8, 2024
@openshift-ci-robot
Copy link
Contributor

@ricky-rav: This pull request references Jira Issue OCPBUGS-33421, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"
  • expected dependent Jira Issue OCPBUGS-32319 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

Differences from 4.14 backport (#2128):

go-controller/pkg/node/gateway_shared_intf.go
same changes

go-controller/pkg/node/gateway_localnet_linux_test.go
added node name to endpoints in unit tests (failing otherwise)

go-controller/pkg/node/healthcheck_service.go
removed unused hasLocalHostNetworkEndpoints

go-controller/pkg/ovn/controller/services/lb_config.go
minor adjustments due to where some config variables are defined (HostMasqueradeIP)

go-controller/pkg/testing/kube.go
same changes

go-controller/pkg/util/kube.go
same changes

==================

First commit:
The previous implementation was an approximation of KEP-1669 ProxyTerminatingEndpoints: we simply included terminating serving endpoints (ready=false, serving=true, terminating=true) along with ready ones in the endpoint selection logic. Let's fully implement KEP-1669 and only include terminating endpoints if none are ready. The selection follows two simple steps: 1) Take all ready endpoints
2) If no ready endpoints were found, take all serving terminating endpoints.

This should also help with an issue found in a production cluster (https://issues.redhat.com/browse/OCPBUGS-24363) where, due to infrequent readiness probes, terminating endpoints were declared as non-serving (that is, their readiness probe failed) only quite late and were included as valid endpoints for quite a bit, while the existing ready endpoints should have been preferred.

Extended the test cases to include testing against multiple slices and dual stack scenarios.

Signed-off-by: Riccardo Ravaioli rravaiol@redhat.com
(cherry picked from commit 418043c)

Second commit:
Fix endpoint selection for externalTrafficPolicy=local
Fix the case for "all endpoints terminating on a node when traffic policy is local":
"When the traffic policy is "Local" and all endpoints are terminating within a single node, then traffic should be routed to any terminating endpoint that is ready on that node."
https://github.com/kubernetes/enhancements/blob/master/keps/sig-network/1669-proxy-terminating-endpoints/README.md#example-all-endpoints-terminating-on-a-node-when-traffic-policy-is-local

The endpoint selection logic in the services controller is now entirely implemented in getEndpointsForService, which computes for a given service and each service port all its cluster-wide endpoints and per-node local endpoints. We first apply a cluster-wide vs local endpoint selection and only then we apply readiness-based filtering with getEligibleEndpointAddresses.

Added unit tests for the new logic.

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.

@jcaamano
Copy link
Contributor

jcaamano commented May 8, 2024

/retest

@jcaamano
Copy link
Contributor

jcaamano commented May 8, 2024

/payload 4.13 ci blocking
/payload 4.13 nightly blocking

Copy link
Contributor

openshift-ci bot commented May 8, 2024

@jcaamano: trigger 4 job(s) of type blocking for the ci release of OCP 4.13

  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-sdn-serial
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-azure-sdn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/9adf8040-0d53-11ef-85bf-86d25e0538e5-0

trigger 6 job(s) of type blocking for the nightly release of OCP 4.13

  • periodic-ci-openshift-release-master-nightly-4.13-e2e-aws-sdn-serial
  • periodic-ci-openshift-release-master-nightly-4.13-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-release-master-nightly-4.13-e2e-metal-ipi-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.13-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/9adf8040-0d53-11ef-85bf-86d25e0538e5-1

@@ -752,7 +752,7 @@ func (nc *DefaultNodeNetworkController) reconcileConntrackUponEndpointSliceEvent
// nothing to do upon an add event
return nil
}
namespacedName, err := serviceNamespacedNameFromEndpointSlice(oldEndpointSlice)
namespacedName, err := util.ServiceNamespacedNameFromEndpointSlice(oldEndpointSlice)
Copy link
Contributor

Choose a reason for hiding this comment

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

Wondering if we should get rid of serviceNamespacedNameFromEndpointSlice

which is what originally happened in
8c7ea95

I would be more concerned if we actually need any of those changes rather than being concerned about this cosmetic issue.

Are we actually cherry picking some but not all of those changes? Perhaps it is cleaner to just cherry-pick that as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's an excellent point that I was missing: I have to backport also 8f0bfab and
8c7ea95. Thanks for pointing it out!

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you edit the opening message with the conflicts that you got after using these two cherry-picks? Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done! I'll do the same for 4.12 tomorrow. Thanks!

@@ -575,6 +575,7 @@ func serviceUpdateNotNeeded(old, new *kapi.Service) bool {

// AddService handles configuring shared gateway bridge flows to steer External IP, Node Port, Ingress LB traffic into OVN
func (npw *nodePortWatcher) AddService(service *kapi.Service) error {
var localEndpoints sets.Set[string]
Copy link
Contributor

Choose a reason for hiding this comment

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

OK I think I am actually confused, because you say same changes but there are differences here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

True. There are some differences in the code, but it didn't lead to any conflicts.

@jcaamano
Copy link
Contributor

/payload 4.13 ci blocking
/payload 4.13 nightly blocking

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

openshift-ci bot commented May 14, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcaamano, 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

Copy link
Contributor

openshift-ci bot commented May 14, 2024

@jcaamano: trigger 4 job(s) of type blocking for the ci release of OCP 4.13

  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-e2e-aws-sdn-serial
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-azure-sdn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/280d8990-11ea-11ef-9eee-14cebc9d9b83-0

trigger 6 job(s) of type blocking for the nightly release of OCP 4.13

  • periodic-ci-openshift-release-master-nightly-4.13-e2e-aws-sdn-serial
  • periodic-ci-openshift-release-master-nightly-4.13-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-release-master-nightly-4.13-e2e-metal-ipi-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.13-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/280d8990-11ea-11ef-9eee-14cebc9d9b83-1

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 14, 2024
@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 May 14, 2024
@ricky-rav
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@ricky-rav: This pull request references Jira Issue OCPBUGS-33421, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@ricky-rav
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 14, 2024
@openshift-ci-robot
Copy link
Contributor

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.z) matches configured target version for branch (4.13.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-32319 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-32319 targets the "4.14.z" version, which is one of the valid target versions: 4.14.0, 4.14.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jechen@redhat.com), skipping review request.

In response to this:

/jira refresh

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.

@jcaamano
Copy link
Contributor

/payload-job periodic-ci-openshift-release-master-ci-4.13-e2e-azure-ovn-upgrade

Copy link
Contributor

openshift-ci bot commented May 14, 2024

@jcaamano: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.13-e2e-azure-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/a04e0cd0-1209-11ef-8983-816505d1df85-0

@jechen0648
Copy link

pre-merge tested 2nd around with latest update

@jechen0648
Copy link

/ocpbugs cc-qa

@jechen0648
Copy link

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label May 14, 2024
@openshift-ci-robot
Copy link
Contributor

@ricky-rav: This pull request references Jira Issue OCPBUGS-33421, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.z) matches configured target version for branch (4.13.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-32319 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-32319 targets the "4.14.z" version, which is one of the valid target versions: 4.14.0, 4.14.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jechen@redhat.com), skipping review request.

In response to this:

Differences from 4.14 backport (#2128):

I had to backport two relevant commits from last year that hadn't been backported to 4.13.

[commit 1] Consider serving endpoints in hasLocalHostNetworkEndpoints 8f0bfab

  • no conflicts

[commit 2] Cleanup of endpoint handling functions 8c7ea95

  • conflict between old and new code of GetLbEndpoints -> applied new code
  • conflict with new tests for GetLbEndpointsL: applied new code

[commit 3] Full implementation of KEP-1669 ProxyTerminatingEndpoints

$ git cherry-pick -x f9185969ae241916687699048e291f1c803e8843
Auto-merging go-controller/pkg/node/default_node_network_controller.go
Auto-merging go-controller/pkg/node/gateway_shared_intf.go
Auto-merging go-controller/pkg/util/kube.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/kube.go
Auto-merging go-controller/pkg/util/kube_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/kube_test.go
error: could not apply f9185969a... Full implementation of KEP-1669 ProxyTerminatingEndpoints
  • go-controller/pkg/util/kube.go: conflict between old and new code of GetLbEndpoints -> applied new code
  • go-controller/pkg/util/kube_test.go: conflict with new tests for GetLbEndpoints: applied new code

[commit 4] Fix endpoint selection for externalTrafficPolicy=local

$ git cherry-pick -x 21431f2032627da4907186c2d83a21fc8ca6c1d1
Auto-merging go-controller/pkg/node/gateway_shared_intf.go
Auto-merging go-controller/pkg/ovn/controller/services/lb_config.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/lb_config.go
Auto-merging go-controller/pkg/ovn/controller/services/lb_config_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/lb_config_test.go
Auto-merging go-controller/pkg/ovn/controller/services/load_balancer_ocphack_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/load_balancer_ocphack_test.go
Auto-merging go-controller/pkg/ovn/controller/services/node_tracker.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/node_tracker.go
Auto-merging go-controller/pkg/ovn/controller/services/services_controller.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/services_controller.go
Auto-merging go-controller/pkg/ovn/controller/services/services_controller_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/services_controller_test.go
Auto-merging go-controller/pkg/util/kube.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/kube.go
Auto-merging go-controller/pkg/util/kube_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/kube_test.go
error: could not apply 21431f203... Fix endpoint selection for externalTrafficPolicy=local
  • lb_config_test.go:

    • Since edc3a34 wasn't backported to 4.13, the unit test for recently unidled services (< grace period of 30s) should show EmptyLBEvents: false.
  • go-controller/pkg/node/healthcheck_service.go

    • Because 2fb43e1 wasn't in 4.13 when my commit merged, git suggested restoring the code from before the linked commit, which I rejected.
  • go-controller/pkg/node/gateway_localnet_linux_test.go

    • added node name to endpoints in unit tests (failing otherwise)
  • go-controller/pkg/node/healthcheck_service.go

    • removed unused hasLocalHostNetworkEndpoints
  • go-controller/pkg/ovn/controller/services/lb_config.go

    • minor adjustments due to where some config variables are defined (HostMasqueradeIP)
  • go-controller/pkg/ovn/controller/services/load_balancer_ocphack_test.go**

    • Applied the file, since we need the OCP hacks
  • go-controller/pkg/util/kube.go

    • Had to remove LbEndpoints and GetLbEndpoints from the code, as done in the original commit
  • go-controller/pkg/ovn/controller/services/node_tracker.go**

    • l3gatewayAddressesStr from 4.14 replaced nodeSubnets in 4.13 (from another commit): I kept nodeSubnets and updated the code to call nodeSubnets
    • removed references to OVN zones in newNodeTracker, since 4.13 has no zone support
  • go-controller/pkg/ovn/controller/services/services_controller.go

    • small conflict just because I rearranged the call to buildTemplateLBs on one line instead of being split into two

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.

@jcaamano
Copy link
Contributor

/hold cancel

@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 May 15, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 221f418 into openshift:release-4.13 May 15, 2024
24 of 26 checks passed
@openshift-ci-robot
Copy link
Contributor

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

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

In response to this:

Differences from 4.14 backport (#2128):

I had to backport two relevant commits from last year that hadn't been backported to 4.13.

[commit 1] Consider serving endpoints in hasLocalHostNetworkEndpoints 8f0bfab

  • no conflicts

[commit 2] Cleanup of endpoint handling functions 8c7ea95

  • conflict between old and new code of GetLbEndpoints -> applied new code
  • conflict with new tests for GetLbEndpointsL: applied new code

[commit 3] Full implementation of KEP-1669 ProxyTerminatingEndpoints

$ git cherry-pick -x f9185969ae241916687699048e291f1c803e8843
Auto-merging go-controller/pkg/node/default_node_network_controller.go
Auto-merging go-controller/pkg/node/gateway_shared_intf.go
Auto-merging go-controller/pkg/util/kube.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/kube.go
Auto-merging go-controller/pkg/util/kube_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/kube_test.go
error: could not apply f9185969a... Full implementation of KEP-1669 ProxyTerminatingEndpoints
  • go-controller/pkg/util/kube.go: conflict between old and new code of GetLbEndpoints -> applied new code
  • go-controller/pkg/util/kube_test.go: conflict with new tests for GetLbEndpoints: applied new code

[commit 4] Fix endpoint selection for externalTrafficPolicy=local

$ git cherry-pick -x 21431f2032627da4907186c2d83a21fc8ca6c1d1
Auto-merging go-controller/pkg/node/gateway_shared_intf.go
Auto-merging go-controller/pkg/ovn/controller/services/lb_config.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/lb_config.go
Auto-merging go-controller/pkg/ovn/controller/services/lb_config_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/lb_config_test.go
Auto-merging go-controller/pkg/ovn/controller/services/load_balancer_ocphack_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/load_balancer_ocphack_test.go
Auto-merging go-controller/pkg/ovn/controller/services/node_tracker.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/node_tracker.go
Auto-merging go-controller/pkg/ovn/controller/services/services_controller.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/services_controller.go
Auto-merging go-controller/pkg/ovn/controller/services/services_controller_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/ovn/controller/services/services_controller_test.go
Auto-merging go-controller/pkg/util/kube.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/kube.go
Auto-merging go-controller/pkg/util/kube_test.go
CONFLICT (content): Merge conflict in go-controller/pkg/util/kube_test.go
error: could not apply 21431f203... Fix endpoint selection for externalTrafficPolicy=local
  • lb_config_test.go:

    • Since edc3a34 wasn't backported to 4.13, the unit test for recently unidled services (< grace period of 30s) should show EmptyLBEvents: false.
  • go-controller/pkg/node/healthcheck_service.go

    • Because 2fb43e1 wasn't in 4.13 when my commit merged, git suggested restoring the code from before the linked commit, which I rejected.
  • go-controller/pkg/node/gateway_localnet_linux_test.go

    • added node name to endpoints in unit tests (failing otherwise)
  • go-controller/pkg/node/healthcheck_service.go

    • removed unused hasLocalHostNetworkEndpoints
  • go-controller/pkg/ovn/controller/services/lb_config.go

    • minor adjustments due to where some config variables are defined (HostMasqueradeIP)
  • go-controller/pkg/ovn/controller/services/load_balancer_ocphack_test.go**

    • Applied the file, since we need the OCP hacks
  • go-controller/pkg/util/kube.go

    • Had to remove LbEndpoints and GetLbEndpoints from the code, as done in the original commit
  • go-controller/pkg/ovn/controller/services/node_tracker.go**

    • l3gatewayAddressesStr from 4.14 replaced nodeSubnets in 4.13 (from another commit): I kept nodeSubnets and updated the code to call nodeSubnets
    • removed references to OVN zones in newNodeTracker, since 4.13 has no zone support
  • go-controller/pkg/ovn/controller/services/services_controller.go

    • small conflict just because I rearranged the call to buildTemplateLBs on one line instead of being split into two

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]

This PR has been included in build ose-ovn-kubernetes-base-container-v4.13.0-202405151107.p0.g221f418.assembly.stream.el9 for distgit ovn-kubernetes-base.
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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-important Referenced Jira bug's severity is important 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. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet