Skip to content

BUG 2054200: Fix removing custom created service in openshift-ingress with same name#707

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
gcs278:BZ2054200-Rebase
Apr 22, 2022
Merged

BUG 2054200: Fix removing custom created service in openshift-ingress with same name#707
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
gcs278:BZ2054200-Rebase

Conversation

@gcs278
Copy link
Contributor

@gcs278 gcs278 commented Feb 24, 2022

If custom created service in the openshift-ingress namespace has the same naming convention of what the ingress controllers uses, it will be deleted. This fix ensures that the only services that get deleted are owned by the ingress controller responsible for creating it.

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. labels Feb 24, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 24, 2022

@gcs278: This pull request references Bugzilla bug 2054200, which is invalid:

  • expected the bug to target the "4.11.0" release, but it targets "---" instead

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

Details

In response to this:

[WIP] BUG 2054200: Fix removing custom created service in openshift-ingress with same name

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 added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Feb 24, 2022
@openshift-ci openshift-ci bot requested review from Miciah and miheer February 24, 2022 02:31
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 24, 2022
@gcs278
Copy link
Contributor Author

gcs278 commented Feb 28, 2022

/retest

@gcs278 gcs278 force-pushed the master branch 2 times, most recently from 27bb961 to 998c28e Compare March 1, 2022 17:03
@gcs278
Copy link
Contributor Author

gcs278 commented Mar 1, 2022

/bugzilla refresh

@openshift-ci openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Mar 1, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 1, 2022

@gcs278: This pull request references Bugzilla bug 2054200, 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.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.11.0) matches configured target release for branch (4.11.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @quarterpin

Details

In response to this:

/bugzilla 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.

@openshift-ci openshift-ci bot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Mar 1, 2022
@openshift-ci openshift-ci bot requested a review from quarterpin March 1, 2022 18:11
@gcs278
Copy link
Contributor Author

gcs278 commented Mar 1, 2022

/retest

2 similar comments
@gcs278
Copy link
Contributor Author

gcs278 commented Mar 1, 2022

/retest

@gcs278
Copy link
Contributor Author

gcs278 commented Mar 1, 2022

/retest

@gcs278 gcs278 changed the title [WIP] BUG 2054200: Fix removing custom created service in openshift-ingress with same name BUG 2054200: Fix removing custom created service in openshift-ingress with same name Mar 2, 2022
@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 Mar 2, 2022
@gcs278
Copy link
Contributor Author

gcs278 commented Mar 3, 2022

/retest

6 similar comments
@gcs278
Copy link
Contributor Author

gcs278 commented Mar 3, 2022

/retest

@gcs278
Copy link
Contributor Author

gcs278 commented Mar 3, 2022

/retest

@gcs278
Copy link
Contributor Author

gcs278 commented Mar 3, 2022

/retest

@gcs278
Copy link
Contributor Author

gcs278 commented Mar 3, 2022

/retest

@gcs278
Copy link
Contributor Author

gcs278 commented Mar 4, 2022

/retest

@gcs278
Copy link
Contributor Author

gcs278 commented Mar 4, 2022

/retest

@gcs278
Copy link
Contributor Author

gcs278 commented Apr 18, 2022

/retest

@quarterpin
Copy link

/label qe-approved
Verified via pre-merge test process. For more details refer to: https://bugzilla.redhat.com/show_bug.cgi?id=2054200#c6

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Apr 20, 2022
Copy link
Contributor

@Miciah Miciah left a comment

Choose a reason for hiding this comment

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

Looks good overall. I have a few small suggestions.

@gcs278 gcs278 force-pushed the BZ2054200-Rebase branch 2 times, most recently from 0db4b10 to 1409927 Compare April 21, 2022 19:28
@gcs278 gcs278 force-pushed the BZ2054200-Rebase branch from 1409927 to dba837a Compare April 21, 2022 19:38
@Miciah
Copy link
Contributor

Miciah commented Apr 21, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 21, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 21, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gcs278, Miciah

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:

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

@gcs278
Copy link
Contributor Author

gcs278 commented Apr 21, 2022

/retest

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 22, 2022

@gcs278: 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-merge-robot openshift-merge-robot merged commit d637e6c into openshift:master Apr 22, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 22, 2022

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

Bugzilla bug 2054200 has been moved to the MODIFIED state.

Details

In response to this:

BUG 2054200: Fix removing custom created service in openshift-ingress with same name

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
Copy link
Contributor Author

gcs278 commented May 5, 2022

/cherry-pick release-4.10

@openshift-cherrypick-robot

@gcs278: #707 failed to apply on top of branch "release-4.10":

Applying: BUG 2054200: Fix removing custom created service in openshift-ingress with same naming convention
Using index info to reconstruct a base tree...
M	pkg/operator/controller/ingress/load_balancer_service.go
M	pkg/operator/controller/ingress/load_balancer_service_test.go
M	test/e2e/operator_test.go
Falling back to patching base and 3-way merge...
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
Auto-merging pkg/operator/controller/ingress/load_balancer_service.go
CONFLICT (content): Merge conflict in pkg/operator/controller/ingress/load_balancer_service.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 BUG 2054200: Fix removing custom created service in openshift-ingress with same naming convention
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.10

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
Copy link
Contributor Author

gcs278 commented Jun 6, 2022

/cherry-pick release-4.10

@openshift-cherrypick-robot

@gcs278: new pull request created: #770

Details

In response to this:

/cherry-pick release-4.10

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
Copy link
Contributor Author

gcs278 commented Sep 12, 2022

/cherry-pick release-4.9

2 similar comments
@gcs278
Copy link
Contributor Author

gcs278 commented Sep 12, 2022

/cherry-pick release-4.9

@gcs278
Copy link
Contributor Author

gcs278 commented Sep 21, 2022

/cherry-pick release-4.9

@openshift-cherrypick-robot

@gcs278: new pull request created: #831

Details

In response to this:

/cherry-pick release-4.9

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.

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. 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. 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.

7 participants