Merge pull request #539 from rhmdnd/implement-rosa-hcp-e2e-testing

implement rosa hcp e2e testing

Author: openshift-merge-bot[bot]

Makefile

@@ -320,7 +320,11 @@ bundle: check-operator-version operator-sdk manifests update-skip-range kustomiz
 	$(SDK_BIN) generate kustomize manifests --apis-dir=./pkg/apis -q
 	@echo "kustomize using deployment image $(IMG)"
 	cd config/manager && $(KUSTOMIZE) edit set image $(APP_NAME)=$(IMG)
+	if [ $(PLATFORM) = "openshift" ]; then \
+                sed -i 's%../default-bundle%../openshift-bundle%' config/manifests/kustomization.yaml; \
+        fi
 	$(KUSTOMIZE) build config/manifests | $(SDK_BIN) generate bundle -q $(BUNDLE_SA_OPTS) --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
+	git restore config/manifests/kustomization.yaml
 	$(SDK_BIN) bundle validate ./bundle
 
 .PHONY: bundle-image
@@ -445,6 +449,10 @@ test-unit: fmt vet ## Run tests.
 e2e: e2e-set-image prep-e2e
 	@$(GO) test ./tests/e2e $(E2E_GO_TEST_FLAGS) -args $(E2E_ARGS)
 
+.PHONY: e2e-rosa
+e2e-rosa: e2e-set-image prep-e2e
+	@$(GO) test ./tests/e2e $(E2E_GO_TEST_FLAGS) -args $(E2E_ARGS) --platform rosa
+
 .PHONY: prep-e2e
 prep-e2e: kustomize
 	rm -rf $(TEST_SETUP_DIR)

config/manager/deployment.yaml

@@ -53,12 +53,7 @@ spec:
           secret:
             secretName: file-integrity-operator-serving-cert
             optional: true
-      nodeSelector:
-        node-role.kubernetes.io/master: ""
       tolerations:
-        - key: "node-role.kubernetes.io/master"
-          operator: "Exists"
-          effect: "NoSchedule"
         - key: "node.kubernetes.io/unreachable"
           operator: "Exists"
           effect: "NoExecute"

config/openshift-bundle/kustomization.yaml

@@ -0,0 +1,13 @@
+namespace: openshift-compliance
+
+bases:
+- ../crd
+- ../rbac
+- ../manager
+- ../ns
+
+patches:
+- path: manager_patch.yaml
+  target:
+    kind: Deployment
+    name: file-integrity-operator

config/openshift-bundle/manager_patch.yaml

@@ -0,0 +1,13 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: file-integrity-operator
+spec:
+  template:
+    spec:
+      nodeSelector:
+        node-role.kubernetes.io/master: ""
+      tolerations:
+        - key: "node-role.kubernetes.io/master"
+          operator: "Exists"
+          effect: "NoSchedule"

tests/e2e/helpers.go

@@ -416,16 +416,19 @@ func deleteStatusEvents(f *framework.Framework, namespace string) error {
 func setupTestRequirements(t *testing.T) *framework.Context {
 	fileIntegrities := &v1alpha1.FileIntegrityList{}
 	nodeStatus := &v1alpha1.FileIntegrityNodeStatusList{}
+	f := framework.NewContext(t)
 
 	err := framework.AddToFrameworkScheme(v1alpha1.AddToScheme, fileIntegrities)
 	if err != nil {
 		t.Fatalf("TEST SETUP: failed to add custom resource scheme to framework: %v", err)
 	}
 
-	mcList := &mcfgv1.MachineConfigList{}
-	err = framework.AddToFrameworkScheme(mcfgapi.Install, mcList)
-	if err != nil {
-		t.Fatalf("TEST SETUP: failed to add custom resource scheme to framework: %v", err)
+	if f.GetPlatform() != "rosa" {
+		mcList := &mcfgv1.MachineConfigList{}
+		err = framework.AddToFrameworkScheme(mcfgapi.Install, mcList)
+		if err != nil {
+			t.Fatalf("TEST SETUP: failed to add custom resource scheme to framework: %v", err)
+		}
 	}
 
 	err = framework.AddToFrameworkScheme(v1alpha1.AddToScheme, nodeStatus)
@@ -439,7 +442,7 @@ func setupTestRequirements(t *testing.T) *framework.Context {
 	if err != nil {
 		t.Fatalf("TEST SETUP: failed to add custom resource scheme to framework: %v", err)
 	}
-	return framework.NewContext(t)
+	return f
 }
 
 func replaceNamespaceFromManifest(t *testing.T, nsFrom, nsTo string, namespacedManPath *string) {

tests/framework/context.go

@@ -27,6 +27,7 @@ type Context struct {
 	kubeclient         kubernetes.Interface
 	restMapper         *restmapper.DeferredDiscoveryRESTMapper
 	skipCleanupOnError bool
+	platform           string
 }
 
 // todo(camilamacedo86): Remove the following line just added for we are able to deprecated TestCtx
@@ -71,6 +72,7 @@ func (f *Framework) newContext(t *testing.T) *Context {
 		kubeclient:         f.KubeClient,
 		restMapper:         f.restMapper,
 		skipCleanupOnError: f.skipCleanupOnError,
+		platform:           f.Platform,
 	}
 }
 
@@ -111,3 +113,7 @@ func (ctx *Context) Cleanup() {
 func (ctx *Context) AddCleanupFn(fn cleanupFn) {
 	ctx.cleanupFns = append(ctx.cleanupFns, fn)
 }
+
+func (ctx *Context) GetPlatform() string {
+	return ctx.platform
+}

tests/framework/framework.go

@@ -68,6 +68,7 @@ type Framework struct {
 	NamespacedManPath *string
 	OperatorNamespace string
 	WatchNamespace    string
+	Platform          string
 
 	restMapper *restmapper.DeferredDiscoveryRESTMapper
 
@@ -88,6 +89,7 @@ type frameworkOpts struct {
 	localOperatorArgs  string
 	isLocalOperator    bool
 	skipCleanupOnError bool
+	platform           string
 }
 
 const (
@@ -98,6 +100,7 @@ const (
 	LocalOperatorFlag      = "localOperator"
 	LocalOperatorArgs      = "localOperatorArgs"
 	SkipCleanupOnErrorFlag = "skipCleanupOnError"
+	PlatformFlag           = "platform"
 
 	TestOperatorNamespaceEnv = "TEST_OPERATOR_NAMESPACE"
 	TestWatchNamespaceEnv    = "TEST_WATCH_NAMESPACE"
@@ -115,6 +118,7 @@ func (opts *frameworkOpts) addToFlagSet(flagset *flag.FlagSet) {
 	flagset.BoolVar(&opts.skipCleanupOnError, SkipCleanupOnErrorFlag, false,
 		"If set as true, the cleanup function responsible to remove all artifacts "+
 			"will be skipped if an error is faced.")
+	flagset.StringVar(&opts.platform, PlatformFlag, "openshift", "The type of deployment hosting the tests. The only supported option besides OpenShift is \"rosa\".")
 }
 
 func newFramework(opts *frameworkOpts) (*Framework, error) {
@@ -168,6 +172,7 @@ func newFramework(opts *frameworkOpts) (*Framework, error) {
 		kubeconfigPath:     opts.kubeconfigPath,
 		restMapper:         restMapper,
 		skipCleanupOnError: opts.skipCleanupOnError,
+		Platform:           opts.platform,
 	}
 
 	// This is required because controller-runtime expects its consumers to