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

az aro update CredentialsRequest hotfix #3325

Merged

Conversation

kimorris27
Copy link
Contributor

Which issue this PR addresses:

Issue where az aro update --refresh-credentials fails because credentialsrequest/openshift-azure-operator doesn't exist (for clusters not yet updated to use the new ARO operator Azure auth scheme; see #3274)

What this PR does / why we need it:

  • Adds a step that reconciles the CredentialsRequest upon every az aro update regardless of the auth scheme the operator is using or whether the update is a CSP refreshing update
  • Fixes the aroCredentialsRequestReconciled function to retry until the timeout if the CredentialsRequest is not found (as opposed to erroring out immediately)

Test plan for issue:

  • On a dev cluster, manually tested the code changes by deleting the CredentialsRequest and then running a successful az aro update --refresh-credentials
  • Added an E2E test that tests whether az aro update recreates a missing CredentialsRequest (did not include the CSP refresh in this test)

Is there any documentation that needs to be updated for this PR?

No

pkg/cluster/condition.go Outdated Show resolved Hide resolved
Copy link
Collaborator

@bennerv bennerv left a comment

Choose a reason for hiding this comment

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

few nits - good first pass though :)

pkg/operator/deploy/deploy.go Show resolved Hide resolved
test/e2e/update.go Outdated Show resolved Hide resolved
Copy link
Collaborator

@bennerv bennerv left a comment

Choose a reason for hiding this comment

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

lgtm

@cadenmarchese cadenmarchese merged commit de1b399 into Azure:master Dec 14, 2023
18 checks passed
cadenmarchese pushed a commit to cadenmarchese/ARO-RP that referenced this pull request Dec 14, 2023
* If the CredentialsRequest isn't found, retry until timeout instead of immediately erroring out

* `ensureCredentialsRequest` upon every `az aro update`

* Add an E2E test for the `az aro update` scenario where the ARO
operator's CredentialsRequest has been deleted
ventifus pushed a commit to ventifus/ARO-RP that referenced this pull request Feb 7, 2024
* If the CredentialsRequest isn't found, retry until timeout instead of immediately erroring out

* `ensureCredentialsRequest` upon every `az aro update`

* Add an E2E test for the `az aro update` scenario where the ARO
operator's CredentialsRequest has been deleted
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chainsaw Pull requests or issues owned by Team Chainsaw ready-for-review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants