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.

Sign up for GitHub

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

Jump to bottom

OCPBUGS-2135: Include CAPG objects in uninstall filter #7907

Merged
merged 1 commit into from
Feb 1, 2024
Merged

OCPBUGS-2135: Include CAPG objects in uninstall filter #7907

merged 1 commit into from
Feb 1, 2024

Conversation

RadekManak
Copy link
Contributor

The GCP CAPI provider uses different label for instances than MAPI.

This PR adds the CAPG label to labels we look for when uninstalling.

@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/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 15, 2024
@openshift-ci-robot
Copy link
Contributor

@RadekManak: This pull request references Jira Issue OCPBUGS-2135, which is invalid:

  • expected the bug to target either version "4.16." or "openshift-4.16.", but it targets "4.14.0" 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:

The GCP CAPI provider uses different label for instances than MAPI.

This PR adds the CAPG label to labels we look for when uninstalling.

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.

@RadekManak
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 Jan 15, 2024
@openshift-ci-robot
Copy link
Contributor

@RadekManak: This pull request references Jira Issue OCPBUGS-2135, 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.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @huali9

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.

@openshift-ci openshift-ci bot requested a review from huali9 January 15, 2024 15:26
@patrickdillon
Copy link
Contributor

/uncc @rna-afk
/cc @bfournie @barbacbd

@openshift-ci openshift-ci bot requested review from barbacbd and bfournie and removed request for rna-afk January 24, 2024 01:54
barbacbd
barbacbd reviewed Jan 29, 2024
View reviewed changes
pkg/destroy/gcp/gcp.go Outdated
@@ -233,7 +233,7 @@ func (o *ClusterUninstaller) clusterIDFilter() string {
}

func (o *ClusterUninstaller) clusterLabelFilter() string {
return fmt.Sprintf("labels.kubernetes-io-cluster-%s = \"owned\"", o.ClusterID)
return fmt.Sprintf("(labels.kubernetes-io-cluster-%s = \"owned\") OR (labels.capg-cluster-%s = \"owned\")", o.ClusterID, o.ClusterID)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
return fmt.Sprintf("(labels.kubernetes-io-cluster-%s = \"owned\") OR (labels.capg-cluster-%s = \"owned\")", o.ClusterID, o.ClusterID)
return fmt.Sprintf("(labels.kubernetes-io-cluster-%s = \"owned\") OR (labels.%s%s = \"owned\")", o.ClusterID, capg.NameGCPProviderOwned, o.ClusterID)

barbacbd
barbacbd reviewed Jan 30, 2024
View reviewed changes
Copy link
Contributor

@barbacbd barbacbd left a comment

Choose a reason for hiding this comment

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

/lgtm

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

/approve

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 31, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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 Jan 31, 2024
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD dad850d and 2 for PR HEAD a3d62c1 in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 1edc5d4 and 1 for PR HEAD a3d62c1 in total

@RadekManak
Copy link
Contributor Author

/retest-required

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 1, 2024 •
edited
Loading

@RadekManak: The following tests 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-gcp-secureboot a3d62c1 link false /test e2e-gcp-secureboot
ci/prow/okd-e2e-aws-ovn-upgrade a3d62c1 link false /test okd-e2e-aws-ovn-upgrade

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.

@barbacbd barbacbd mentioned this pull request Feb 1, 2024
Merged
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD a07aae8 and 0 for PR HEAD a3d62c1 in total

@openshift-merge-bot openshift-merge-bot bot merged commit 056cd84 into openshift:master Feb 1, 2024
24 of 26 checks passed
@openshift-ci-robot
Copy link
Contributor

@RadekManak: Jira Issue OCPBUGS-2135: All pull requests linked via external trackers have merged:

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

In response to this:

The GCP CAPI provider uses different label for instances than MAPI.

This PR adds the CAPG label to labels we look for when uninstalling.

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-installer-altinfra-container-v4.16.0-202402020041.p0.g056cd84.assembly.stream for distgit ose-installer-altinfra.
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
Reviewers

@barbacbd barbacbd barbacbd left review comments

@patrickdillon patrickdillon Awaiting requested review from patrickdillon

@huali9 huali9 Awaiting requested review from huali9

@bfournie bfournie Awaiting requested review from bfournie

Assignees

@barbacbd barbacbd

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RadekManak @openshift-ci-robot @patrickdillon @openshift-bot @barbacbd