ASTRACTL-32772: rework Trident upgrade logic, better error handling #352
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
palicena
commented
Jun 4, 2024
| @@ -1097,10 +1097,9 @@ get_registry_credentials_from_pull_secret() { | |||
| # 6. Get the first matching entry's `.value.auth`, which would be `B64_ENCODED_USERNAME_PASSWORD` here | |||
| # 7. The `B64_ENCODED_USERNAME_PASSWORD` can then be passed to curl via | |||
| # `-H 'Authorization: Basic B64_ENCODED_USERNAME_PASSWORD'` without having to decode it first. | |||
| local -r contents="$(kubectl get secret "$pull_secret" -n "$namespace" -o json 2> /dev/null)" | |||
| local -r contents="$(k8s_get_resource "secret/$pull_secret" "$namespace" "json")" | |||
There was a problem hiding this comment.
You'll see quite a few of these changes; most kubectl get commands now instead use k8s_get_resource or k8s_resource_exists, which actually handles kubectl errors instead of just sending them into the void.
…rdless of which COMPONENTS is used
palicena
commented
Jun 4, 2024
| if [ -z "$current" ] || [ "$current" == null ] || [ -n "$captured_err" ]; then | ||
| add_problem "Failed to get your cluster's Kubernetes version: $captured_err" | ||
| return 1 | ||
| fi |
There was a problem hiding this comment.
Since this is not a kubectl get and is only called once, the error is handled here instead of using k8s_get_resource or k8s_resource_exists (or making a new function).
palicena
commented
Jun 4, 2024
| else | ||
| add_problem "k8s permissions: user does not have admin privileges" "Kubernetes user does not have admin privileges" | ||
| add_problem "Failed to check if Kubernetes user has admin privilege: unknown error" |
There was a problem hiding this comment.
Similar to above, this kubectl auth can-i is pretty unique and not called anywhere else so we just handle the errors in-line instead of making a new function.
palicena
commented
Jun 4, 2024
| @@ -2350,6 +2416,7 @@ step_apply_resources() { | |||
| # Apply operator resources | |||
| logdebug "apply operator resources" | |||
| local output="" | |||
| local captured_err="" | |||
There was a problem hiding this comment.
This variable declaration was missing, so the call 3 lines down was putting the value in a global variable instead.
palicena
commented
Jun 4, 2024
…-connector-operator into ASTRACTL-32772-misc-fixes-6
…o ASTRACTL-32772-misc-fixes-7
zachatnetapp
approved these changes
Jun 5, 2024
* Revert "ASTRACTL-32772: remove pull secret stuff" This reverts commit 8af69b1. * ASTRACTL-32772: better pull secret handling * ASTRACTL-32772: rework registry resolution for error message * ASTRACTL-32772: suppress unneeded registry output
…o ASTRACTL-32772-misc-fixes-7
…-connector-operator into ASTRACTL-32772-misc-fixes-7
Minimum allowed line rate is |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
kubectl getcommands; we'll now be able to differentiate connection/timeout errors VS not found, and users will get much better feedback when something does go wrong