Special case default revision for trust domain patching

GoogleCloudPlatform · Oct 12, 2021 · 1c3296c · 1c3296c
1 parent c7c18d1
commit 1c3296c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/asmcli/asmcli b/asmcli/asmcli
diff --git a/asmcli/components/ca/mesh-ca.sh b/asmcli/components/ca/mesh-ca.sh
@@ -45,7 +45,14 @@ EOF
   if [[ "$ISTIOD_COUNT" -ne 0 ]]; then
     local REVISION; REVISION="$(retry 2 kubectl -n istio-system get pod -l app=istiod \
       -o jsonpath='{.items[].spec.containers[].env[?(@.name=="REVISION")].value}')"
-    local RAW_TRUST_DOMAINS_ALIASES; RAW_TRUST_DOMAINS_ALIASES="$(retry 2 kubectl -n istio-system get configmap istio-"${REVISION}" \
+
+    if [[ -z "${REVISION}" || "${REVISION}" = istio-default ]]; then
+      REVISION=""
+    else
+      REVISION="-${REVISION}"
+    fi
+
+    local RAW_TRUST_DOMAINS_ALIASES; RAW_TRUST_DOMAINS_ALIASES="$(retry 2 kubectl -n istio-system get configmap istio"${REVISION}" \
       -o jsonpath='{.data.mesh}' | sed -e '1,/trustDomainAliases:/ d')"
     local RAW_TRUST_DOMAINS_ALIAS;
     while IFS= read -r RAW_TRUST_DOMAINS_ALIAS; do