Revert "istioctl: fix istioctl operator remove fail when a revision w…

…as not specified (istio#42160)" (istio#42500)

This reverts commit defc1cb.

operator/cmd/mesh/operator-common.go

@@ -55,7 +55,7 @@ const (
 // isControllerInstalled reports whether an operator deployment exists in the given namespace.
 func isControllerInstalled(cs kubernetes.Interface, operatorNamespace string, revision string) (bool, error) {
 	orn := operatorResourceName
-	if revision != "" && revision != "default" {
+	if revision != "" {
 		orn += "-" + revision
 	}
 	return deploymentExists(cs, operatorNamespace, orn)

operator/cmd/mesh/operator-init.go

@@ -91,10 +91,6 @@ func operatorInit(args *RootArgs, oiArgs *operatorInitArgs, l clog.Logger) {
 	if err != nil {
 		l.LogAndFatal(err)
 	}
-
-	if oiArgs.common.revision == "default" {
-		oiArgs.common.revision = ""
-	}
 	// Error here likely indicates Deployment is missing. If some other K8s error, we will hit it again later.
 	already, _ := isControllerInstalled(kubeClient.Kube(), oiArgs.common.operatorNamespace, oiArgs.common.revision)
 	if already {

tests/integration/operator/switch_cr_test.go

@@ -113,53 +113,26 @@ func TestController(t *testing.T) {
 				"--manifests=" + ManifestPath,
 				"--revision=" + "v2",
 			}
-			// install other operator deployment with different revision
+			// install second operator deployment with different revision
 			istioCtl.InvokeOrFail(t, initCmd)
 			t.TrackResource(&operatorDumper{rev: "v2"})
 			installWithCRFile(t, t, cs, istioCtl, "default", "v2")
 			installWithCRFile(t, t, cs, istioCtl, "default", "")
-			installWithCRFile(t, t, cs, istioCtl, "default", "v3")
-			installWithCRFile(t, t, cs, istioCtl, "default", "v4")
 
 			// istio control plane resources expected to be deleted after deleting CRs
 			cleanupInClusterCRs(t, cs)
 
 			// test operator remove command
-			scopes.Framework.Infof("checking operator remove command by revision")
-			removeCmddefault := []string{
-				"operator", "remove",
-				"--skip-confirmation",
-			}
-			istioCtl.InvokeOrFail(t, removeCmddefault)
-
-			removeCmdv2 := []string{
-				"operator", "remove",
-				"--skip-confirmation",
-				"--revision", "v2",
-			}
-			istioCtl.InvokeOrFail(t, removeCmdv2)
-
-			retry.UntilSuccessOrFail(t, func() error {
-				for _, n := range []string{"istio-operator", "istio-operator-v2"} {
-					if svc, _ := cs.Kube().CoreV1().Services(OperatorNamespace).Get(context.TODO(), n, metav1.GetOptions{}); svc.Name != "" {
-						return fmt.Errorf("got operator service: %s from cluster, expected to be removed", svc.Name)
-					}
-					if dp, _ := cs.Kube().AppsV1().Deployments(OperatorNamespace).Get(context.TODO(), n, metav1.GetOptions{}); dp.Name != "" {
-						return fmt.Errorf("got operator deployment %s from cluster, expected to be removed", dp.Name)
-					}
-				}
-				return nil
-			}, retry.Timeout(retryTimeOut), retry.Delay(retryDelay))
-
-			scopes.Framework.Infof("checking operator remove command by purge")
+			scopes.Framework.Infof("checking operator remove command")
 			removeCmd := []string{
 				"operator", "remove",
 				"--skip-confirmation",
 				"--purge",
 			}
 			istioCtl.InvokeOrFail(t, removeCmd)
+
 			retry.UntilSuccessOrFail(t, func() error {
-				for _, n := range []string{"istio-operator-v3", "istio-operator-v4"} {
+				for _, n := range []string{"istio-operator", "istio-operator-v2"} {
 					if svc, _ := cs.Kube().CoreV1().Services(OperatorNamespace).Get(context.TODO(), n, metav1.GetOptions{}); svc.Name != "" {
 						return fmt.Errorf("got operator service: %s from cluster, expected to be removed", svc.Name)
 					}