K8SPXC-1431 fix pvc deletion with finalizer #2232
Draft
+171
−79
Conversation
This file contains hidden or 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Comment on lines
+11
to
+12
| local backup_name="$1" | ||
| local finalizer_flag="off" |
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| local backup_name="$1" | |
| local finalizer_flag="off" | |
| local backup_name="$1" | |
| local finalizer_flag="off" |
Comment on lines
+14
to
+18
| desc "Checking finalizers on backup $backup_name" | ||
| # Check if pxc-backup has the finalizer "percona.com/delete-backup" | ||
| if kubectl get pxc-backup "$backup_name" -o jsonpath='{.metadata.finalizers}' | grep -q "percona.com/delete-backup"; then | ||
| finalizer_flag="on" | ||
| fi |
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| desc "Checking finalizers on backup $backup_name" | |
| # Check if pxc-backup has the finalizer "percona.com/delete-backup" | |
| if kubectl get pxc-backup "$backup_name" -o jsonpath='{.metadata.finalizers}' | grep -q "percona.com/delete-backup"; then | |
| finalizer_flag="on" | |
| fi | |
| desc "Checking finalizers on backup $backup_name" | |
| # Check if pxc-backup has the finalizer "percona.com/delete-backup" | |
| if kubectl get pxc-backup "$backup_name" -o jsonpath='{.metadata.finalizers}' | grep -q "percona.com/delete-backup"; then | |
| finalizer_flag="on" | |
| fi |
| finalizer_flag="on" | ||
| fi | ||
|
|
||
| echo "Finalizer is $finalizer_flag" |
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| echo "Finalizer is $finalizer_flag" | |
| echo "Finalizer is $finalizer_flag" |
Comment on lines
+22
to
+23
| echo "Looking for PVCs containing '$backup_name'" | ||
| pvc=$(kubectl get pvc --no-headers -o custom-columns=":metadata.name" | grep "$backup_name") |
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| echo "Looking for PVCs containing '$backup_name'" | |
| pvc=$(kubectl get pvc --no-headers -o custom-columns=":metadata.name" | grep "$backup_name") | |
| echo "Looking for PVCs containing '$backup_name'" | |
| pvc=$(kubectl get pvc --no-headers -o custom-columns=":metadata.name" | grep "$backup_name") |
Comment on lines
+25
to
+28
| if [[ -z "$pvc" ]]; then | ||
| echo "No PVCs found with substring '$backup_name'" | ||
| return 1 | ||
| fi |
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| if [[ -z "$pvc" ]]; then | |
| echo "No PVCs found with substring '$backup_name'" | |
| return 1 | |
| fi | |
| if [[ -z $pvc ]]; then | |
| echo "No PVCs found with substring '$backup_name'" | |
| return 1 | |
| fi |
| apply_config "$pxcClientFile" | ||
| if [[ $IMAGE_PXC =~ 5\.7 ]] && [[ $cluster == 'demand-backup' || $cluster == 'demand-backup-cloud' ]]; then | ||
| cat_config "$config" \ | ||
| cat_config "$config"\ |
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| cat_config "$config"\ | |
| cat_config "$config" \ |
| } | ||
|
|
||
| check_pvc_md5() { | ||
| local backup_name="$1" |
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| local backup_name="$1" | |
| local backup_name="$1" |
| } | ||
|
|
||
| get_pvc_name_for_backup() { | ||
| local backup_name="$1" |
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| local backup_name="$1" | |
| local backup_name="$1" |
| fi | ||
| local pvc_name="${destination#pvc/}" | ||
|
|
||
| echo "$pvc_name" |
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| echo "$pvc_name" | |
| echo "$pvc_name" |
|
|
||
| echo "$pvc_name" | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
Comment on lines
+1802
to
+1807
| local destination=$(kubectl_bin get pxc-backup "$backup_name" -o jsonpath='{.status.destination}') | ||
| if [[ -z "$destination" ]]; then | ||
| echo "No destination found in backup $backup_name" | ||
| return 1 | ||
| fi | ||
| local pvc_name="${destination#pvc/}" |
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| local destination=$(kubectl_bin get pxc-backup "$backup_name" -o jsonpath='{.status.destination}') | |
| if [[ -z "$destination" ]]; then | |
| echo "No destination found in backup $backup_name" | |
| return 1 | |
| fi | |
| local pvc_name="${destination#pvc/}" | |
| local destination=$(kubectl_bin get pxc-backup "$backup_name" -o jsonpath='{.status.destination}') | |
| if [[ -z $destination ]]; then | |
| echo "No destination found in backup $backup_name" | |
| return 1 | |
| fi | |
| local pvc_name="${destination#pvc/}" |
Comment on lines
+52
to
+55
| cat "$file" \ | ||
| | $sed -E "s#(claimName: xb-on-demand-backup-pvc)(-[0-9]{14}-[a-f0-9]{8})?#claimName: $pvc_name#" \ | ||
| > "${file}.patched" | ||
| mv "${file}.patched" "$file" |
Contributor
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| cat "$file" \ | |
| | $sed -E "s#(claimName: xb-on-demand-backup-pvc)(-[0-9]{14}-[a-f0-9]{8})?#claimName: $pvc_name#" \ | |
| > "${file}.patched" | |
| mv "${file}.patched" "$file" | |
| cat "$file" \ | |
| | $sed -E "s#(claimName: xb-on-demand-backup-pvc)(-[0-9]{14}-[a-f0-9]{8})?#claimName: $pvc_name#" \ | |
| >"${file}.patched" | |
| mv "${file}.patched" "$file" |
Collaborator
commit: b6dbce1 |
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.
CHANGE DESCRIPTION
Problem:
Short explanation of the problem.
Cause:
Short explanation of the root cause of the issue if applicable.
Solution:
Short explanation of the solution we are providing with this PR.
CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
compare/*-oc.yml)?Config/Logging/Testability