Merge pull request #5610 from qiuming-best/release-1.10

Enhance upgrade velero bash script
vmware-tanzu · Nov 22, 2022 · 3f9a598 · 3f9a598
2 parents 5ecb144 + 29c992a
commit 3f9a598
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/site/content/docs/main/upgrade-to-1.10.md b/site/content/docs/main/upgrade-to-1.10.md
@@ -58,12 +58,12 @@ Before upgrading, check the [Velero compatibility matrix](https://github.com/vmw
     | kubectl apply -f -
 
     # optional, if using the restic daemon set
-    dsjson=$(kubectl get ds -n velero -ojson)
-    kubectl delete ds -n velero --all --force --grace-period 0
-    echo $dsjson | sed "s#\"image\"\: \"velero\/velero\:v[0-9]*.[0-9]*.[0-9]\"#\"image\"\: \"velero\/velero\:v1.10.0\"#g" \
+    echo $(kubectl get ds -n velero restic -ojson) \
+    | sed "s#\"image\"\: \"velero\/velero\:v[0-9]*.[0-9]*.[0-9]\"#\"image\"\: \"velero\/velero\:v1.10.0\"#g" \
     | sed "s#\"name\"\: \"restic\"#\"name\"\: \"node-agent\"#g" \
     | sed "s#\[ \"restic\",#\[ \"node-agent\",#g" \
     | kubectl apply -f -
+    kubectl delete ds -n velero restic --force --grace-period 0
     ```
 
 1. Confirm that the deployment is up and running with the correct version by running:

diff --git a/site/content/docs/v1.10.0-rc.1/upgrade-to-1.10.md b/site/content/docs/v1.10.0-rc.1/upgrade-to-1.10.md
@@ -58,12 +58,12 @@ Before upgrading, check the [Velero compatibility matrix](https://github.com/vmw
     | kubectl apply -f -
 
     # optional, if using the restic daemon set
-    dsjson=$(kubectl get ds -n velero -ojson)
-    kubectl delete ds -n velero --all --force --grace-period 0
-    echo $dsjson | sed "s#\"image\"\: \"velero\/velero\:v[0-9]*.[0-9]*.[0-9]\"#\"image\"\: \"velero\/velero\:v1.10.0\"#g" \
+    echo $(kubectl get ds -n velero restic -ojson) \
+    | sed "s#\"image\"\: \"velero\/velero\:v[0-9]*.[0-9]*.[0-9]\"#\"image\"\: \"velero\/velero\:v1.10.0\"#g" \
     | sed "s#\"name\"\: \"restic\"#\"name\"\: \"node-agent\"#g" \
     | sed "s#\[ \"restic\",#\[ \"node-agent\",#g" \
     | kubectl apply -f -
+    kubectl delete ds -n velero restic --force --grace-period 0
     ```
 
 1. Confirm that the deployment is up and running with the correct version by running: