uninstall: fix no confirmation when istiod cannot be connected (istio…

…#47617) * fix no confirmation when istiod cannot be connected * revise
WillardHu · Oct 31, 2023 · 7aa04ee · 7aa04ee
1 parent 968a6f9
commit 7aa04ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/operator/cmd/mesh/uninstall.go b/operator/cmd/mesh/uninstall.go
@@ -211,9 +211,6 @@ func preCheckWarnings(cmd *cobra.Command, kubeClient kube.CLIClient, uiArgs *uni
 	rev string, resourcesList []*unstructured.UnstructuredList, objectsList object.K8sObjects, l *clog.ConsoleLogger, dryRun bool,
 ) {
 	pids, err := proxyinfo.GetIDsFromProxyInfo(kubeClient, istioNamespace)
-	if err != nil {
-		l.LogAndError(err.Error())
-	}
 	needConfirmation, message := false, ""
 	if uiArgs.purge {
 		needConfirmation = true
@@ -238,6 +235,10 @@ func preCheckWarnings(cmd *cobra.Command, kubeClient kube.CLIClient, uiArgs *uni
 			}
 			message += "If you proceed with the uninstall, these proxies will become detached from any control plane" +
 				" and will not function correctly.\n"
+		} else if rev != "" && err != nil {
+			needConfirmation = true
+			message += fmt.Sprintf("Unable to find any proxies pointing to the %s control plane. "+
+				"This may be because the control plane cannot be connected or there is no %s control plane.\n", rev, rev)
 		}
 		if gwList != "" {
 			needConfirmation = true

diff --git a/releasenotes/notes/47617.yaml b/releasenotes/notes/47617.yaml
@@ -0,0 +1,6 @@
+apiVersion: release-notes/v2
+kind: bug-fix
+area: installation
+releaseNotes:
+- |
+  **Fixed** an issue where sometimes `uninstall` was performed without confirmation when istiod was not available to be connected.