Fix helm cleanup

keithmattix · keithmattix · commit 747d47055101 · 2025-08-11T15:18:32.000Z
Signed-off-by: Keith Mattix II &lt;keithmattix@microsoft.com&gt;
diff --git a/content/en/docs/ambient/install/multicluster/multi-primary_multi-network/index.md b/content/en/docs/ambient/install/multicluster/multi-primary_multi-network/index.md
@@ -405,8 +405,8 @@ $ kubectl delete ns istio-system --context="${CTX_CLUSTER2}"
 Delete Istio Helm installation from `cluster1`:
 
 {{< text syntax=bash >}}
-$ helm delete ztunnel -n istio-system "${CTX_CLUSTER1}"
-$ helm delete istio-cni -n istio-system "${CTX_CLUSTER1}"
+$ helm delete ztunnel -n istio-system --kube-context "${CTX_CLUSTER1}"
+$ helm delete istio-cni -n istio-system --kube-context "${CTX_CLUSTER1}"
 $ helm delete istiod -n istio-system --kube-context "${CTX_CLUSTER1}"
 $ helm delete istio-base -n istio-system --kube-context "${CTX_CLUSTER1}"
 {{< /text >}}
@@ -420,8 +420,8 @@ $ kubectl delete ns istio-system --context="${CTX_CLUSTER1}"
 Delete Istio Helm installation from `cluster2`:
 
 {{< text syntax=bash >}}
-$ helm delete ztunnel -n istio-system "${CTX_CLUSTER2}"
-$ helm delete istio-cni -n istio-system "${CTX_CLUSTER2}"
+$ helm delete ztunnel -n istio-system --kube-context "${CTX_CLUSTER2}"
+$ helm delete istio-cni -n istio-system --kube-context "${CTX_CLUSTER2}"
 $ helm delete istiod -n istio-system --kube-context "${CTX_CLUSTER2}"
 $ helm delete istio-base -n istio-system --kube-context "${CTX_CLUSTER2}"
 {{< /text >}}
diff --git a/content/en/docs/ambient/install/multicluster/multi-primary_multi-network/snips.sh b/content/en/docs/ambient/install/multicluster/multi-primary_multi-network/snips.sh
@@ -224,8 +224,8 @@ istioctl create-remote-secret \
 }
 
 snip_cleanup_3() {
-helm delete ztunnel -n istio-system "${CTX_CLUSTER1}"
-helm delete istio-cni -n istio-system "${CTX_CLUSTER1}"
+helm delete ztunnel -n istio-system --kube-context "${CTX_CLUSTER1}"
+helm delete istio-cni -n istio-system --kube-context "${CTX_CLUSTER1}"
 helm delete istiod -n istio-system --kube-context "${CTX_CLUSTER1}"
 helm delete istio-base -n istio-system --kube-context "${CTX_CLUSTER1}"
 }
@@ -235,8 +235,8 @@ kubectl delete ns istio-system --context="${CTX_CLUSTER1}"
 }
 
 snip_cleanup_5() {
-helm delete ztunnel -n istio-system "${CTX_CLUSTER2}"
-helm delete istio-cni -n istio-system "${CTX_CLUSTER2}"
+helm delete ztunnel -n istio-system --kube-context "${CTX_CLUSTER2}"
+helm delete istio-cni -n istio-system --kube-context "${CTX_CLUSTER2}"
 helm delete istiod -n istio-system --kube-context "${CTX_CLUSTER2}"
 helm delete istio-base -n istio-system --kube-context "${CTX_CLUSTER2}"
 }

Original file line number	Diff line number	Diff line change
`@@ -224,8 +224,8 @@ istioctl create-remote-secret \`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`snip_cleanup_3() {`
`227`		`-helm delete ztunnel -n istio-system "${CTX_CLUSTER1}"`
`228`		`-helm delete istio-cni -n istio-system "${CTX_CLUSTER1}"`
	`227`	`+helm delete ztunnel -n istio-system --kube-context "${CTX_CLUSTER1}"`
	`228`	`+helm delete istio-cni -n istio-system --kube-context "${CTX_CLUSTER1}"`
`229`	`229`	`helm delete istiod -n istio-system --kube-context "${CTX_CLUSTER1}"`
`230`	`230`	`helm delete istio-base -n istio-system --kube-context "${CTX_CLUSTER1}"`
`231`	`231`	`}`
`@@ -235,8 +235,8 @@ kubectl delete ns istio-system --context="${CTX_CLUSTER1}"`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`snip_cleanup_5() {`
`238`		`-helm delete ztunnel -n istio-system "${CTX_CLUSTER2}"`
`239`		`-helm delete istio-cni -n istio-system "${CTX_CLUSTER2}"`
	`238`	`+helm delete ztunnel -n istio-system --kube-context "${CTX_CLUSTER2}"`
	`239`	`+helm delete istio-cni -n istio-system --kube-context "${CTX_CLUSTER2}"`
`240`	`240`	`helm delete istiod -n istio-system --kube-context "${CTX_CLUSTER2}"`
`241`	`241`	`helm delete istio-base -n istio-system --kube-context "${CTX_CLUSTER2}"`
`242`	`242`	`}`