Revert "Add sandbox option to VerticaScrutinize, to run using sandbox hosts instead of main cluster (#1183)"

This reverts commit d9f59a7.

Author: cchen-vertica

api/v1beta1/verticascrutinize_types.go

@@ -83,11 +83,6 @@ type VerticaScrutinizeSpec struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// A list of labels that will be added to the scrutinize pod.
 	Labels map[string]string `json:"labels,omitempty"`
-
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	// Set scrutinize to run using the hosts of a single sandbox
-	// If this is omitted, it will run using the main cluster
-	Sandbox string `json:"sandbox,omitempty"`
 }
 
 // VerticaScrutinizeStatus defines the observed state of VerticaScrutinize

pkg/controllers/vscr/scrutinizepod_reconciler.go

@@ -95,20 +95,14 @@ func (s *ScrutinizePodReconciler) Reconcile(ctx context.Context, _ *ctrl.Request
 // to the vcluster scrutinize CLI
 func (s *ScrutinizePodReconciler) collectInfoFromVdb(ctx context.Context) (ctrl.Result, error) {
 	finder := iter.MakeSubclusterFinder(s.VRec.Client, s.Vdb)
-
-	cluster := v1.MainCluster
-	if s.Vscr.Spec.Sandbox != "" {
-		cluster = s.Vscr.Spec.Sandbox
-	}
-
-	pods, err := finder.FindPods(ctx, iter.FindExisting, cluster)
+	pods, err := finder.FindPods(ctx, iter.FindExisting, v1.MainCluster)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 
 	hosts := s.getHostList(pods.Items)
 	if len(hosts) == 0 {
-		s.Log.Info("could not find any pod with NMA running, requeue reconciliation", "Cluster", cluster)
+		s.Log.Info("could not find any pod with NMA running, requeue reconciliation")
 		return ctrl.Result{Requeue: true}, nil
 	}
 	s.ScrArgs = &ScrutinizeCmdArgs{}

pkg/controllers/vscr/scrutinizepod_reconciler_test.go

@@ -160,55 +160,4 @@ var _ = Describe("scrutinizepod_reconciler", func() {
 		Expect(args).Should(ContainElement(ContainSubstring("--log-age-oldest-time")))
 		Expect(args).Should(ContainElement(ContainSubstring("--log-age-newest-time")))
 	})
-
-	It("should create scrutinize pod for sandbox", func() {
-		vdb := v1.MakeVDBForScrutinize()
-
-		const scName = "sc1"
-		const sbName = "sb1"
-
-		vdb.Spec.Subclusters = append(vdb.Spec.Subclusters, v1.Subcluster{
-			Name: scName,
-			Size: 3,
-		})
-		vdb.Spec.Sandboxes = []v1.Sandbox{
-			{Name: sbName, Subclusters: []v1.SandboxSubcluster{{Name: scName}}},
-		}
-
-		test.CreateVDB(ctx, k8sClient, vdb)
-		defer test.DeleteVDB(ctx, k8sClient, vdb)
-
-		vdb.Status.Sandboxes = []v1.SandboxStatus{
-			{Name: sbName, Subclusters: []string{scName}},
-		}
-
-		test.CreatePods(ctx, k8sClient, vdb, test.AllPodsRunning)
-		defer test.DeletePods(ctx, k8sClient, vdb)
-
-		sc := &vdb.Spec.Subclusters[1]
-		cntStatuses := []corev1.ContainerStatus{
-			{Name: names.NMAContainer, Ready: true},
-		}
-		test.SetPodContainerStatus(ctx, k8sClient, names.GenPodName(vdb, sc, 0), cntStatuses)
-
-		vscr := v1beta1.MakeVscr()
-		vscr.Spec.Sandbox = sbName
-		v1beta1_test.CreateVSCR(ctx, k8sClient, vscr)
-		defer v1beta1_test.DeleteVSCR(ctx, k8sClient, vscr)
-		cond := v1.MakeCondition(v1beta1.ScrutinizeReady, metav1.ConditionTrue, "")
-		meta.SetStatusCondition(&vscr.Status.Conditions, *cond)
-
-		r := MakeScrutinizePodReconciler(vscrRec, vscr, logger)
-		res, err := r.Reconcile(ctx, &ctrl.Request{})
-		defer v1beta1_test.DeleteScrutinizePod(ctx, k8sClient, vscr)
-		Expect(err).Should(Succeed())
-		Expect(res).Should(Equal(ctrl.Result{}))
-
-		pod := &corev1.Pod{}
-		Expect(k8sClient.Get(ctx, vscr.ExtractNamespacedName(), pod)).Should(Succeed())
-		Expect(vscr.Status.PodName).Should(Equal(pod.Name))
-		Expect(vscr.Status.PodUID).Should(Equal(pod.UID))
-		checkStatusConditionAndStateAfterReconcile(ctx, vscr, v1beta1.ScrutinizePodCreated, metav1.ConditionTrue,
-			"PodCreated", "PodCreated")
-	})
 })

pkg/controllers/vscr/vdbverify_reconciler.go

@@ -69,16 +69,6 @@ func (s *VDBVerifyReconciler) Reconcile(ctx context.Context, _ *ctrl.Request) (c
 		return ctrl.Result{}, s.updateStateAndScrutinizeReadyCondition(ctx, metav1.ConditionFalse, events.VerticaDBNotFound,
 			fmt.Sprintf("NotReady:%s", events.VerticaDBNotFound))
 	}
-
-	// If sandbox is defined and sandbox does not exist, we want to exit early
-	sandbox := s.Vscr.Spec.Sandbox
-	if sandbox != "" && s.Vdb.GetSandboxStatus(sandbox) == nil {
-		s.VRec.Eventf(s.Vscr, corev1.EventTypeWarning, events.SandboxNotFound,
-			"Sandbox '%s' was not found in the Vertica DB", sandbox)
-		return ctrl.Result{}, s.updateStateAndScrutinizeReadyCondition(ctx, metav1.ConditionFalse, events.SandboxNotFound,
-			fmt.Sprintf("NotReady:%s", events.SandboxNotFound))
-	}
-
 	return ctrl.Result{}, s.checkVersionAndDeploymentType(ctx)
 }
 

pkg/controllers/vscr/verticascrutinize_controller.go

@@ -225,8 +225,6 @@ func (r *VerticaScrutinizeReconciler) logScrutinizeNotReadyMsg(log logr.Logger,
 		msg = fmt.Sprintf("The server version could not be found in the VerticaDB %s", vdbName)
 	case events.VclusterOpsScrutinizeNotSupported:
 		msg = "The server version does not have scrutinize support through vclusterOps"
-	case events.SandboxNotFound:
-		msg = "Sandbox could not be found"
 	default:
 		msg = "The server version does not support vclusterOps scrutinize reading db password from secret"
 	}

pkg/events/event.go

@@ -142,7 +142,6 @@ const (
 	VclusterOpsScrutinizeNotSupported = "VclusterOpsScrutinizeNotSupported"
 	VclusterOpsScrutinizeSucceeded    = "VclusterOpsScrutinizeSucceeded"
 	VclusterOpsScrutinizeFailed       = "VclusterOpsScrutinizeFailed"
-	SandboxNotFound                   = "SandboxNotFound"
 )
 
 // Constants for VerticaReplicator reconciler