From 8b0b7b8b4f059c20ca4b384917b45320220d1d3f Mon Sep 17 00:00:00 2001 From: Chris Routh Date: Sun, 15 Dec 2024 09:17:41 -0800 Subject: [PATCH] Fix pv-updater.sh for changes in yq --- contrib/pv-updater.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/pv-updater.sh b/contrib/pv-updater.sh index 7b3f55c..5b8a04a 100755 --- a/contrib/pv-updater.sh +++ b/contrib/pv-updater.sh @@ -43,19 +43,19 @@ if [[ ! -f ${PV_ORIG_FILE} ]]; then kubectl get pv "${PV}" -o yaml >"${PV_ORIG_FILE}" fi -reclaimPolicy=$(yq eval '.spec.persistentVolumeReclaimPolicy' "${PV_ORIG_FILE}") +reclaimPolicy=$(yq '.spec.persistentVolumeReclaimPolicy' "${PV_ORIG_FILE}") # copy file for editing cp "${PV_ORIG_FILE}" "${PV_TMP_FILE}" # pre-process before edit -yq -i eval 'del(.metadata.resourceVersion)' "${PV_TMP_FILE}" +yq -i -y 'del(.metadata.resourceVersion)' "${PV_TMP_FILE}" # manually edit ${EDITOR} "${PV_TMP_FILE}" # ask if looks good -yq eval '.' "${PV_TMP_FILE}" +yq '.' "${PV_TMP_FILE}" yes_or_no "Would you like to delete the existing PV object and recreate with the above data?" # set relaim to Retain on PV @@ -69,7 +69,7 @@ kubectl patch pv "${PV}" -p '{"metadata":{"finalizers": null }}' &>/dev/null || kubectl apply -f "${PV_TMP_FILE}" # restore original reclaim value -kubectl patch pv "${PV}" -p "{\"spec\":{\"persistentVolumeReclaimPolicy\":\"${reclaimPolicy}\"}}" +kubectl patch pv "${PV}" -p "{\"spec\":{\"persistentVolumeReclaimPolicy\":${reclaimPolicy}}}" # spit out any zfs properties updates yes_or_no "Would you like to delete the PV backup file?" && {