Fix broken tests

Signed-off-by: Max Smythe <smythe@google.com>

pkg/controller/constrainttemplate/constrainttemplate_controller_test.go

@@ -579,7 +579,7 @@ violation[{"msg": "denied!"}] {
 	}
 
 	// Set up tracker
-	tracker, err := readiness.SetupTracker(mgr, false, false)
+	tracker, err := readiness.SetupTrackerNoReadyz(mgr, false, false)
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/readiness/setup.go

@@ -26,6 +26,21 @@ import (
 // provided Manager object.
 // NOTE: Must be called _before_ the manager is started.
 func SetupTracker(mgr manager.Manager, mutationEnabled bool, externalDataEnabled bool) (*Tracker, error) {
+	tracker, err := SetupTrackerNoReadyz(mgr, mutationEnabled, externalDataEnabled)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := mgr.AddReadyzCheck("tracker", tracker.CheckSatisfied); err != nil {
+		return nil, fmt.Errorf("registering readiness check: %w", err)
+	}
+
+	return tracker, nil
+}
+
+// SetupTracker sets up a readiness tracker and registers it to run under control of the
+// provided Manager object without instantiating /readyz (used for testing).
+func SetupTrackerNoReadyz(mgr manager.Manager, mutationEnabled bool, externalDataEnabled bool) (*Tracker, error) {
 	tracker := NewTracker(mgr.GetAPIReader(), mutationEnabled, externalDataEnabled)
 
 	err := mgr.Add(manager.RunnableFunc(func(ctx context.Context) error {
@@ -35,9 +50,5 @@ func SetupTracker(mgr manager.Manager, mutationEnabled bool, externalDataEnabled
 		return nil, fmt.Errorf("adding tracker to manager: %w", err)
 	}
 
-	if err := mgr.AddReadyzCheck("tracker", tracker.CheckSatisfied); err != nil {
-		return nil, fmt.Errorf("registering readiness check: %w", err)
-	}
-
 	return tracker, nil
 }

pkg/target/target_test.go

@@ -90,7 +90,7 @@ func TestValidateConstraint(t *testing.T) {
 				"matchExpressions": [{
 					"key": "someKey",
 					"operator": "NotIn",
-					"values": ["some value"]
+					"values": ["some-value"]
 				}]
 			}
 		},
@@ -130,7 +130,7 @@ func TestValidateConstraint(t *testing.T) {
 			ErrorExpected: true,
 		},
 		{
-			Name: "Invalid LabelSelector MatchLels",
+			Name: "Invalid LabelSelector MatchLabels",
 			Constraint: `
 {
 	"apiVersion": "constraints.gatekeeper.sh/v1beta1",
@@ -212,7 +212,7 @@ func TestValidateConstraint(t *testing.T) {
 				"matchExpressions": [{
 					"key": "someKey",
 					"operator": "In",
-					"values": ["some value"]
+					"values": ["some-value"]
 				}]
 			}
 		},
@@ -245,7 +245,7 @@ func TestValidateConstraint(t *testing.T) {
 				"matchExpressions": [{
 					"key": "someKey",
 					"operator": "In",
-					"values": ["some value"]
+					"values": ["some-value"]
 				}]
 			}
 		},