Fix common-instancetypes func tests with HCO

tests/common_instancetypes_test.go

@@ -24,7 +24,12 @@ var _ = Describe("Common Instance Types", func() {
 		strategy.RevertToOriginalSspCr()
 	})
 
-	Context("operand", func() {
+	Context("when SSP is not deployed by HCO", func() {
+
+		BeforeEach(func() {
+			strategy.SkipIfDeployedByHCO()
+		})
+
 		It("should reconcile resources from internal bundle by default", func() {
 			virtualMachineClusterInstancetypes, err := common_instancetypes.FetchBundleResource[instancetypev1beta1.VirtualMachineClusterInstancetype]("../" + common_instancetypes.BundleDir + common_instancetypes.ClusterInstancetypesBundle)
 			Expect(err).ToNot(HaveOccurred())
@@ -127,6 +132,39 @@ var _ = Describe("Common Instance Types", func() {
 			}
 		})
 	})
+
+	Context("when SSP is deployed by HCO", func() {
+
+		BeforeEach(func() {
+			strategy.SkipIfNotDeployedByHCO()
+		})
+
+		It("should not claim ownership or remove existing resources deployed by virt-operator", func() {
+			virtualMachineClusterInstancetypes, err := common_instancetypes.FetchBundleResource[instancetypev1beta1.VirtualMachineClusterInstancetype]("../" + common_instancetypes.BundleDir + common_instancetypes.ClusterInstancetypesBundle)
+			Expect(err).ToNot(HaveOccurred())
+
+			virtualMachineClusterPreferences, err := common_instancetypes.FetchBundleResource[instancetypev1beta1.VirtualMachineClusterPreference]("../" + common_instancetypes.BundleDir + common_instancetypes.ClusterPreferencesBundle)
+			Expect(err).ToNot(HaveOccurred())
+
+			assertObjectManagedByVirtOperator := func(name string, obj client.Object) {
+				// The SSP provided bundle may be out of sync with virt-operator so don't assert err here and ignore any missing resources
+				if err := apiClient.Get(ctx, client.ObjectKey{Name: name}, obj); err == nil {
+					// Assert that anything we do find is managed by virt-operator
+					Expect(obj.GetLabels()).To(HaveKeyWithValue(virtv1.ManagedByLabel, virtv1.ManagedByLabelOperatorValue))
+				}
+			}
+
+			for _, instancetype := range virtualMachineClusterInstancetypes {
+				assertObjectManagedByVirtOperator(instancetype.Name, &instancetypev1beta1.VirtualMachineClusterInstancetype{})
+			}
+
+			for _, preference := range virtualMachineClusterPreferences {
+				assertObjectManagedByVirtOperator(preference.Name, &instancetypev1beta1.VirtualMachineClusterPreference{})
+			}
+		})
+
+	})
+
 	Context("webhook", func() {
 		DescribeTable("should reject URL", func(URL string) {
 			sspObj := getSsp()

tests/env/env.go

@@ -20,6 +20,7 @@ const (
 	envSspDeploymentName      = "SSP_DEPLOYMENT_NAME"
 	envSspDeploymentNamespace = "SSP_DEPLOYMENT_NAMESPACE"
 	envSspWebhookServiceName  = "SSP_WEBHOOK_SERVICE_NAME"
+	envSkipDeployedByHCO      = "SKIP_SSP_DEPLOYED_BY_HCO"
 )
 
 const (
@@ -47,6 +48,10 @@ func ShouldSkipCleanupAfterTests() bool {
 	return getBoolEnv(envSkipCleanupAfterTests)
 }
 
+func IsDeployedByHCO() bool {
+	return getBoolEnv(envSkipDeployedByHCO)
+}
+
 var timeout time.Duration
 
 func Timeout() time.Duration {

tests/tests_suite_test.go

@@ -75,6 +75,8 @@ type TestSuiteStrategy interface {
 	SkipUnlessHighlyAvailableTopologyMode()
 	SkipUnlessSingleReplicaTopologyMode()
 	SkipIfUpgradeLane()
+	SkipIfDeployedByHCO()
+	SkipIfNotDeployedByHCO()
 }
 
 type newSspStrategy struct {
@@ -127,6 +129,11 @@ func (s *newSspStrategy) Init() {
 		},
 	}
 
+	// When the original env is deployed by HCO skip common-instancetypes deployment and tests
+	if env.IsDeployedByHCO() {
+		newSsp.Spec.FeatureGates.DeployCommonInstancetypes = ptr.To(false)
+	}
+
 	Eventually(func() error {
 		return apiClient.Create(ctx, newSsp)
 	}, env.Timeout(), time.Second).ShouldNot(HaveOccurred())
@@ -226,6 +233,26 @@ func skipIfUpgradeLane() {
 	}
 }
 
+func (s *newSspStrategy) SkipIfDeployedByHCO() {
+	skipIfDeployedByHCO()
+}
+
+func (s *newSspStrategy) SkipIfNotDeployedByHCO() {
+	skipIfNotDeployedByHCO()
+}
+
+func skipIfDeployedByHCO() {
+	if env.IsDeployedByHCO() {
+		Skip("Skipping as SSP was deployed by HCO", 1)
+	}
+}
+
+func skipIfNotDeployedByHCO() {
+	if !env.IsDeployedByHCO() {
+		Skip("Skipping as SSP was not deployed by HCO", 1)
+	}
+}
+
 type existingSspStrategy struct {
 	Name      string
 	Namespace string
@@ -357,6 +384,14 @@ func (s *existingSspStrategy) SkipIfUpgradeLane() {
 	skipIfUpgradeLane()
 }
 
+func (s *existingSspStrategy) SkipIfDeployedByHCO() {
+	skipIfDeployedByHCO()
+}
+
+func (s *existingSspStrategy) SkipIfNotDeployedByHCO() {
+	skipIfNotDeployedByHCO()
+}
+
 var (
 	apiClient          client.Client
 	coreClient         *kubernetes.Clientset