[release-4.10] BUG 2094051: Fix removing custom created service in openshift-ingress with same naming convention by gcs278 · Pull Request #820 · openshift/cluster-ingress-operator

gcs278 · 2022-08-26T04:55:35Z

This is an manual cherry-pick of #707 due to merge conflicts for the release-4.10 branch.

Merge Conflicts:
[gspence@gspence cluster-ingress-operator]$ git cherry-pick dba837a

Auto-merging test/e2e/operator_test.go
CONFLICT (content): Merge conflict in test/e2e/operator_test.go
Auto-merging pkg/operator/controller/ingress/load_balancer_service_test.go
CONFLICT (content): Merge conflict in pkg/operator/controller/ingress/load_balancer_service_test.go
Auto-merging pkg/operator/controller/ingress/load_balancer_service.go

test/e2e/operator_test.go:

TestTunableRouterKubeletProbesForDefaultIngressController and TestTunableRouterKubeletProbesForCustomIngressController moved/removed while I added TestIngressControllerServiceNameCollision right next to them

pkg/operator/controller/ingress/load_balancer_service_test.go

Added TestServiceIngressOwner and conflicted with existing TestLoadBalancerServiceAnnotationsChanged

/assign gcs278

openshift-ci · 2022-08-26T04:55:53Z

@gcs278: This pull request references Bugzilla bug 2094051, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.10.z) matches configured target release for branch (4.10.z)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 2054200 is in the state CLOSED (ERRATA), which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 2054200 targets the "4.11.0" release, which is one of the valid target releases: 4.11.0, 4.11.z
bug has dependents

Requesting review from QA contact:
/cc @quarterpin

Details

In response to this:

BUG 2094051: Fix removing custom created service in openshift-ingress with same naming convention

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.

Miciah · 2022-08-31T16:41:05Z

/assign

candita · 2022-08-31T17:06:05Z

/assign

openshift-ci · 2022-08-31T18:26:08Z

@gcs278: This pull request references Bugzilla bug 2094051, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.10.z) matches configured target release for branch (4.10.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 2054200 is in the state CLOSED (ERRATA), which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 2054200 targets the "4.11.0" release, which is one of the valid target releases: 4.11.0, 4.11.z
bug has dependents

Requesting review from QA contact:
/cc @quarterpin

Details

In response to this:

BUG 2094051: Fix removing custom created service in openshift-ingress with same naming convention

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.

candita · 2022-08-31T19:01:18Z

Looks identical to previous PR
/approve

openshift-ci · 2022-08-31T19:05:38Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: candita

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~~ [candita]

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

candita · 2022-09-01T18:37:25Z

/retest-required

quarterpin · 2022-09-05T07:38:30Z

/label qe-approved
/label cherry-pick-approved

Verified via pre-merge workflow, for more details : https://bugzilla.redhat.com/show_bug.cgi?id=2094051#c2

gcs278 · 2022-09-12T21:58:44Z

Thanks, needs a lgtm from @candita or @Miciah

openshift-ci · 2022-09-12T22:11:28Z

@gcs278: This pull request references Bugzilla bug 2094051, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.10.z) matches configured target release for branch (4.10.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 2054200 is in the state CLOSED (ERRATA), which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 2054200 targets the "4.11.0" release, which is one of the valid target releases: 4.11.0, 4.11.z
bug has dependents

Requesting review from QA contact:
/cc @quarterpin

Details

In response to this:

BUG 2094051: Fix removing custom created service in openshift-ingress with same naming convention

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.

gcs278 · 2022-09-21T19:28:28Z

/retest

Miciah · 2022-09-21T20:57:51Z

pkg/operator/controller/ingress/load_balancer_service_test.go

+		if actual := isServiceOwnedByIngressController(tc.service, ic); actual != tc.expect {
+			t.Errorf("expected ownership %t got %t", tc.expect, actual)
+		}
+	}


cluster-ingress-operator/pkg/operator/controller/ingress/load_balancer_service_test.go

Line 1064 in 84d7e67

has an extra newline here. Any reason it's absent from this backport? Are we going to delete the newline in the main branch?

Wow good eye. Yea this was collateral damage from the merge. I'll fix real quick.

Miciah · 2022-09-21T20:58:28Z

/label backport-risk-assessed

… with same naming convention

gcs278 · 2022-09-22T17:06:11Z

/retest

gcs278 · 2022-09-22T17:07:50Z

/retitle [release-4.10] BUG 2094051: Fix removing custom created service in openshift-ingress with same naming convention

Miciah · 2022-09-22T17:22:30Z

Thanks!
/lgtm

openshift-ci · 2022-09-22T18:27:27Z

@gcs278: All pull requests linked via external trackers have merged:

openshift/cluster-ingress-operator#820

Bugzilla bug 2094051 has been moved to the MODIFIED state.

Details

In response to this:

[release-4.10] BUG 2094051: Fix removing custom created service in openshift-ingress with same naming convention

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 bot assigned gcs278 Aug 26, 2022

openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high 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 Aug 26, 2022

openshift-ci bot requested review from alebedev87, knobunc and quarterpin August 26, 2022 04:55

openshift-ci bot assigned Miciah Aug 31, 2022

openshift-ci bot assigned candita Aug 31, 2022

gcs278 force-pushed the bz2094051-release4.10 branch from 4b257b9 to dfe06ae Compare August 31, 2022 18:27

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 31, 2022

openshift-ci bot added qe-approved Signifies that QE has signed off on this PR cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Sep 5, 2022

Miciah reviewed Sep 21, 2022

View reviewed changes

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Sep 21, 2022

openshift-ci bot assigned lihongan, melvinjoseph86, quarterpin and ShudiLi Sep 21, 2022

BUG 2054200: Fix removing custom created service in openshift-ingress…

e0df790

… with same naming convention

gcs278 force-pushed the bz2094051-release4.10 branch from dfe06ae to e0df790 Compare September 21, 2022 21:04

openshift-ci bot changed the title ~~BUG 2094051: Fix removing custom created service in openshift-ingress with same naming convention~~ [release-4.10] BUG 2094051: Fix removing custom created service in openshift-ingress with same naming convention Sep 22, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 22, 2022

openshift-merge-robot merged commit b1a3bc3 into openshift:release-4.10 Sep 22, 2022

Conversation

gcs278 commented Aug 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Aug 26, 2022

Uh oh!

Miciah commented Aug 31, 2022

Uh oh!

candita commented Aug 31, 2022

Uh oh!

openshift-ci bot commented Aug 31, 2022

Uh oh!

candita commented Aug 31, 2022

Uh oh!

openshift-ci bot commented Aug 31, 2022

Uh oh!

candita commented Sep 1, 2022

Uh oh!

quarterpin commented Sep 5, 2022

Uh oh!

gcs278 commented Sep 12, 2022

Uh oh!

openshift-ci bot commented Sep 12, 2022

Uh oh!

gcs278 commented Sep 21, 2022

Uh oh!

Miciah Sep 21, 2022

Choose a reason for hiding this comment

Uh oh!

gcs278 Sep 21, 2022

Choose a reason for hiding this comment

Uh oh!

Miciah commented Sep 21, 2022

Uh oh!

gcs278 commented Sep 22, 2022

Uh oh!

gcs278 commented Sep 22, 2022

Uh oh!

Miciah commented Sep 22, 2022

Uh oh!

openshift-ci bot commented Sep 22, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

gcs278 commented Aug 26, 2022 •

edited

Loading