From ebd8ee5c8c47048a3945373e7a7f105c6d75f77a Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Tue, 12 Dec 2023 11:39:50 -0600 Subject: [PATCH] fix: dioscuri migration uses invalid base64 decode flag --- legacy/build-deploy-docker-compose.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/legacy/build-deploy-docker-compose.sh b/legacy/build-deploy-docker-compose.sh index 5165e4d7..3313941e 100755 --- a/legacy/build-deploy-docker-compose.sh +++ b/legacy/build-deploy-docker-compose.sh @@ -1344,11 +1344,8 @@ ROUTES=$(kubectl -n ${NAMESPACE} get ingress --sort-by='{.metadata.name}' -l "ac # swap dioscuri for activestanby label for ingress in $(kubectl -n ${NAMESPACE} get ingress -l "dioscuri.amazee.io/migrate" -o json | jq -r '.items[] | @base64'); do - _jq() { - echo ${ingress} | base64 --decode | jq -r ${1} - } - INGRESS_NAME=$(echo $(_jq '.') | jq -r '.metadata.name') - MIGRATE_VALUE=$(echo $(_jq '.') | jq -r '.metadata.labels["dioscuri.amazee.io/migrate"] // false ') + INGRESS_NAME=$(echo $ingress | jq -Rr '@base64d | fromjson | .metadata.name') + MIGRATE_VALUE=$(echo $ingress | jq -Rr '@base64d | fromjson | .metadata.labels["dioscuri.amazee.io/migrate"] // false') PATCH='{ "metadata": { "labels": {