OCPBUGS-23466: Let router use svc ips by enxebre · Pull Request #3218 · openshift/hypershift

enxebre · 2023-11-21T18:19:15Z

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

Checklist

Subject and description added to both, commit and PR.
Relevant issues have been referenced.
This change includes docs.
This change includes unit tests.

openshift-ci-robot · 2023-11-21T18:19:20Z

@enxebre: This pull request references Jira Issue OCPBUGS-23466, which is invalid:

expected the bug to target the "4.15.0" version, but no target version was set

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.

Details

In response to this:

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

Checklist

Subject and description added to both, commit and PR.

Relevant issues have been referenced.

This change includes docs.

This change includes unit tests.

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 · 2023-11-21T18:19:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [enxebre]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

enxebre · 2023-11-21T18:19:55Z

/jira refresh

openshift-ci-robot · 2023-11-21T18:20:06Z

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

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.15.0) matches configured target version for branch (4.15.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

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

Details

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

netlify · 2023-11-21T18:20:38Z

✅ Deploy Preview for hypershift-docs ready!

Name	Link
🔨 Latest commit	`e4efc2f`
🔍 Latest deploy log	https://app.netlify.com/sites/hypershift-docs/deploys/655cf4a5471cb3000840d074
😎 Deploy Preview	https://deploy-preview-3218--hypershift-docs.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

csrwng

Thanks, some comments, but generally lgtm

csrwng · 2023-11-21T19:34:19Z

  mode http
  monitor-uri /haproxy_ready

 resolvers coredns


delete this section

csrwng · 2023-11-21T19:34:41Z

+{{range .Backends }}
 backend {{ .Name }}
-  server {{ .Name }} {{ .DestinationService }}.{{ $ns }}.svc.cluster.local:{{.DestinationPort}} check resolvers coredns init-addr last,libc,none
+  server {{ .Name }} {{ .DestinationServiceIP }}:{{.DestinationPort}} check resolvers coredns init-addr last,libc,none


s/resolvers coredns init-addr last,libc,none//

csrwng · 2023-11-21T19:34:45Z

 {{- if .HasKubeAPI }}
 backend kube_api
-  server kube_api kube-apiserver.{{ $ns }}.svc.cluster.local:{{ .KASSVCPort }} check resolvers coredns init-addr last,libc,none
+  server kube_api {{ .KASDestinationServiceIP }}:{{ .KASSVCPort }} check resolvers coredns init-addr last,libc,none


s/resolvers coredns init-addr last,libc,none//

csrwng · 2023-11-21T19:36:39Z

 func (r byRouteName) Less(i, j int) bool { return r[i].Name < r[j].Name }

-func generateRouterConfig(namespace string, routeList *routev1.RouteList, nameServerIP string) (string, error) {
+func generateRouterConfig(routeList *routev1.RouteList, nameServerIP string, svcsNameToIP map[string]string) (string, error) {


nameServerIP is no longer needed

csrwng · 2023-11-21T20:29:41Z

/lgtm

openshift-ci-robot · 2023-11-22T00:13:44Z

/retest-required

Remaining retests: 0 against base HEAD 4413eb8 and 2 for PR HEAD c185421 in total

openshift-ci-robot · 2023-11-22T07:14:44Z

/retest-required

Remaining retests: 0 against base HEAD b1d19f7 and 1 for PR HEAD c185421 in total

openshift-ci · 2023-11-22T09:09:40Z

@enxebre: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

openshift-ci-robot · 2023-11-22T09:11:52Z

@enxebre: Jira Issue OCPBUGS-23466: All pull requests linked via external trackers have merged:

openshift/hypershift#3218

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

Details

In response to this:

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

Checklist

Subject and description added to both, commit and PR.

Relevant issues have been referenced.

This change includes docs.

This change includes unit tests.

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.

enxebre · 2023-11-22T09:42:48Z

/cherrypick release-4.14

openshift-cherrypick-robot · 2023-11-22T09:43:42Z

@enxebre: #3218 failed to apply on top of branch "release-4.14":

Applying: Let router use svc ips
Using index info to reconstruct a base tree...
M	control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
M	control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go
M	control-plane-operator/controllers/hostedcontrolplane/ingress/router.go
M	control-plane-operator/controllers/hostedcontrolplane/ingress/router_config.template
M	control-plane-operator/controllers/hostedcontrolplane/ingress/router_test.go
M	control-plane-operator/main.go
Falling back to patching base and 3-way merge...
Removing support/util/resolver_test.go
Removing support/util/resolver.go
Auto-merging control-plane-operator/main.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/ingress/router_test.go
CONFLICT (content): Merge conflict in control-plane-operator/controllers/hostedcontrolplane/ingress/router_test.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/ingress/router_config.template
CONFLICT (content): Merge conflict in control-plane-operator/controllers/hostedcontrolplane/ingress/router_config.template
Auto-merging control-plane-operator/controllers/hostedcontrolplane/ingress/router.go
CONFLICT (content): Merge conflict in control-plane-operator/controllers/hostedcontrolplane/ingress/router.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go
CONFLICT (content): Merge conflict in control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller_test.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
CONFLICT (content): Merge conflict in control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Let router use svc ips
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-4.14

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-bot · 2023-11-22T15:25:56Z

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-hypershift-container-v4.15.0-202311221354.p0.g27d0f8f.assembly.stream for distgit hypershift.
All builds following this will include this PR.

openshift-merge-robot · 2023-11-24T02:56:25Z

Fix included in accepted release 4.14.0-0.nightly-2023-11-23-154014

openshift-ci-robot added 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 Nov 21, 2023

openshift-ci Bot added the do-not-merge/needs-area label Nov 21, 2023

openshift-ci Bot requested review from csrwng and isco-rodriguez November 21, 2023 18:19

openshift-ci Bot added the area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release label Nov 21, 2023

openshift-ci Bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-area labels Nov 21, 2023

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 Nov 21, 2023

enxebre force-pushed the let-router-use-svc-ips branch from e4efc2f to 1b2fa99 Compare November 21, 2023 18:33

csrwng reviewed Nov 21, 2023

View reviewed changes

enxebre force-pushed the let-router-use-svc-ips branch from 1b2fa99 to 1fae69c Compare November 21, 2023 19:57

Let router use svc ips

c185421

enxebre force-pushed the let-router-use-svc-ips branch from 1fae69c to c185421 Compare November 21, 2023 19:58

openshift-ci Bot assigned csrwng Nov 21, 2023

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Nov 21, 2023

openshift-merge-bot Bot merged commit 27d0f8f into openshift:main Nov 22, 2023

enxebre mentioned this pull request Nov 22, 2023

[release-4.14] OCPBUGS-23558: Let router use svc ips 4.14 #3221

Merged

4 tasks

Uh oh!

Conversation

enxebre commented Nov 21, 2023

Uh oh!

openshift-ci-robot commented Nov 21, 2023

Uh oh!

openshift-ci Bot commented Nov 21, 2023

Uh oh!

enxebre commented Nov 21, 2023

Uh oh!

openshift-ci-robot commented Nov 21, 2023

Uh oh!

netlify Bot commented Nov 21, 2023

✅ Deploy Preview for hypershift-docs ready!

Uh oh!

csrwng left a comment

Choose a reason for hiding this comment

Uh oh!

csrwng Nov 21, 2023

Choose a reason for hiding this comment

Uh oh!

csrwng Nov 21, 2023

Choose a reason for hiding this comment

Uh oh!

csrwng Nov 21, 2023

Choose a reason for hiding this comment

Uh oh!

csrwng Nov 21, 2023

Choose a reason for hiding this comment

Uh oh!

csrwng commented Nov 21, 2023

Uh oh!

openshift-ci-robot commented Nov 22, 2023

Uh oh!

openshift-ci-robot commented Nov 22, 2023

Uh oh!

openshift-ci Bot commented Nov 22, 2023

Uh oh!

openshift-ci-robot commented Nov 22, 2023

Uh oh!

enxebre commented Nov 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-cherrypick-robot commented Nov 22, 2023

Uh oh!

openshift-bot commented Nov 22, 2023

Uh oh!

openshift-merge-robot commented Nov 24, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

enxebre commented Nov 22, 2023 •

edited

Loading