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

OCM-7358 | fix: invert describe out for cluster delete protection #1920

Merged
merged 1 commit into from Apr 11, 2024

Conversation

ciaranRoche
Copy link
Member

WHAT

Inverts the check for the delete protection output. This was a regression introduced when changing output from yes/no to enabled/disabled

Verification

$ rosa describe cluster -c croche

Name:                       croche
Domain Prefix:              croche
Display Name:               croche
ID:                         2ai5ok6qebvc8jk442pnsoci2ob00fmn
External ID:                cd7d5abb-c099-417e-8e5b-b84069c1e6bd
Control Plane:              Customer Hosted
OpenShift Version:          4.15.6
Channel Group:              stable
DNS:                        croche.cgbh.s1.devshift.org
AWS Account:                765374464689
API URL:                    https://api.croche.cgbh.s1.devshift.org:6443
Console URL:                https://console-openshift-console.apps.croche.cgbh.s1.devshift.org
Region:                     eu-west-1
Multi-AZ:                   false

Nodes:
 - Control plane:           3
 - Infra:                   2
 - Compute:                 2
Network:
 - Type:                    OVNKubernetes
 - Service CIDR:            172.30.0.0/16
 - Machine CIDR:            10.0.0.0/16
 - Pod CIDR:                10.128.0.0/14
 - Host Prefix:             /23
Infra ID:                   croche-mdddk
EC2 Metadata Http Tokens:   optional
Role (STS) ARN:             arn:aws:iam::765374464689:role/croche10-Installer-Role
Support Role ARN:           arn:aws:iam::765374464689:role/croche10-Support-Role
Instance IAM Roles:
 - Control plane:           arn:aws:iam::765374464689:role/croche10-ControlPlane-Role
 - Worker:                  arn:aws:iam::765374464689:role/croche10-Worker-Role
Operator IAM Roles:
 - arn:aws:iam::765374464689:role/croche-d4x9-openshift-cloud-credential-operator-cloud-credential
 - arn:aws:iam::765374464689:role/croche-d4x9-openshift-image-registry-installer-cloud-credentials
 - arn:aws:iam::765374464689:role/croche-d4x9-openshift-ingress-operator-cloud-credentials
 - arn:aws:iam::765374464689:role/croche-d4x9-openshift-cluster-csi-drivers-ebs-cloud-credentials
 - arn:aws:iam::765374464689:role/croche-d4x9-openshift-cloud-network-config-controller-cloud-cred
 - arn:aws:iam::765374464689:role/croche-d4x9-openshift-machine-api-aws-cloud-credentials
Managed Policies:           No
State:                      ready 
Private:                    No
Delete Protection:          Disabled
Created:                    Apr 10 2024 15:03:47 UTC
User Workload Monitoring:   Enabled
Details Page:               https://qaprodauth.console.redhat.com/openshift/details/s/2eujbNzzmYWKZitj3LIY53bdaTp
OIDC Endpoint URL:          https://oidc.os1.devshift.org/2ai5ok6qebvc8jk442pnsoci2ob00fmn (Classic)

╭─croche@fedora ~/Work/scripts ‹master●› 
╰─$ rosa edit cluster -c croche --enable-delete-protection=true 
I: Interactive mode enabled.
Any optional fields can be ignored and will not be updated.
? Private cluster, check this command's help for possible impacts: No
? Disable Workload monitoring: No
? Enable cluster deletion protection: Yes
I: Updated cluster 'croche'
╭─croche@fedora ~/Work/scripts ‹master●› 
╰─$ rosa describe cluster -c croche                             

Name:                       croche
Domain Prefix:              croche
Display Name:               croche
ID:                         2ai5ok6qebvc8jk442pnsoci2ob00fmn
External ID:                cd7d5abb-c099-417e-8e5b-b84069c1e6bd
Control Plane:              Customer Hosted
OpenShift Version:          4.15.6
Channel Group:              stable
DNS:                        croche.cgbh.s1.devshift.org
AWS Account:                765374464689
API URL:                    https://api.croche.cgbh.s1.devshift.org:6443
Console URL:                https://console-openshift-console.apps.croche.cgbh.s1.devshift.org
Region:                     eu-west-1
Multi-AZ:                   false

Nodes:
 - Control plane:           3
 - Infra:                   2
 - Compute:                 2
Network:
 - Type:                    OVNKubernetes
 - Service CIDR:            172.30.0.0/16
 - Machine CIDR:            10.0.0.0/16
 - Pod CIDR:                10.128.0.0/14
 - Host Prefix:             /23
Infra ID:                   croche-mdddk
EC2 Metadata Http Tokens:   optional
Role (STS) ARN:             arn:aws:iam::765374464689:role/croche10-Installer-Role
Support Role ARN:           arn:aws:iam::765374464689:role/croche10-Support-Role
Instance IAM Roles:
 - Control plane:           arn:aws:iam::765374464689:role/croche10-ControlPlane-Role
 - Worker:                  arn:aws:iam::765374464689:role/croche10-Worker-Role
Operator IAM Roles:
 - arn:aws:iam::765374464689:role/croche-d4x9-openshift-cloud-credential-operator-cloud-credential
 - arn:aws:iam::765374464689:role/croche-d4x9-openshift-image-registry-installer-cloud-credentials
 - arn:aws:iam::765374464689:role/croche-d4x9-openshift-ingress-operator-cloud-credentials
 - arn:aws:iam::765374464689:role/croche-d4x9-openshift-cluster-csi-drivers-ebs-cloud-credentials
 - arn:aws:iam::765374464689:role/croche-d4x9-openshift-cloud-network-config-controller-cloud-cred
 - arn:aws:iam::765374464689:role/croche-d4x9-openshift-machine-api-aws-cloud-credentials
Managed Policies:           No
State:                      ready 
Private:                    No
Delete Protection:          Enabled
Created:                    Apr 10 2024 15:03:47 UTC
User Workload Monitoring:   Enabled
Details Page:               https://qaprodauth.console.redhat.com/openshift/details/s/2eujbNzzmYWKZitj3LIY53bdaTp
OIDC Endpoint URL:          https://oidc.os1.devshift.org/2ai5ok6qebvc8jk442pnsoci2ob00fmn (Classic)

JIRA - https://issues.redhat.com/browse/OCM-7358

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 11, 2024
Copy link
Contributor

@robpblake robpblake 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 Apr 11, 2024
Copy link
Contributor

openshift-ci bot commented Apr 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ciaranRoche, robpblake

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:
  • OWNERS [ciaranRoche,robpblake]

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 Apr 11, 2024

@ciaranRoche: all tests passed!

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.

Copy link

codecov bot commented Apr 11, 2024

Codecov Report

Attention: Patch coverage is 0% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 21.76%. Comparing base (c35b5da) to head (5fa1f5b).
Report is 2 commits behind head on master.

Files Patch % Lines
cmd/describe/cluster/cmd.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1920   +/-   ##
=======================================
  Coverage   21.76%   21.76%           
=======================================
  Files         118      118           
  Lines       19775    19775           
=======================================
  Hits         4304     4304           
  Misses      15145    15145           
  Partials      326      326           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@openshift-merge-bot openshift-merge-bot bot merged commit 9355e1f into openshift:master Apr 11, 2024
9 checks passed
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants