UPSTREAM: <carry>: Apply SCC in e2e tests when reinstalling operator …

…in another namespace

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 7509eee)
(cherry picked from commit 38cc1fd)
(cherry picked from commit de2462b)

cluster/sync-operator.sh

@@ -19,6 +19,10 @@ function deploy_operator() {
     $kubectl apply -f $MANIFESTS_DIR/role_binding.yaml
     $kubectl apply -f deploy/crds/nmstate.io_nmstates.yaml
     $kubectl apply -f $MANIFESTS_DIR/operator.yaml
+
+    if isOpenshift; then
+        $kubectl apply -f $MANIFESTS_DIR/scc.yaml
+    fi
 }
 
 function wait_ready_operator() {

hack/ocp-e2e-tests.sh

@@ -49,8 +49,6 @@ fi
 while ! oc wait mcp --all --for=condition=Updated --timeout -1s; do sleep 1; done
 
 make cluster-sync-operator
-# Will fail on subsequent runs, this is fine.
-oc create -f build/_output/manifests/scc.yaml || :
 oc create -f test/e2e/nmstate.yaml
 # On first deployment, it can take a while for all of the pods to come up
 # First wait for the handler pods to be created

test/e2e/operator/operator.go

@@ -137,7 +137,6 @@ func InstallOperator(operator TestData) {
 		false,
 		fmt.Sprintf("OPERATOR_NAMESPACE=%s", operator.Ns),
 		fmt.Sprintf("HANDLER_NAMESPACE=%s", operator.Ns),
-		"IMAGE_REGISTRY=registry:5000",
 		"manifests",
 	)
 	Expect(err).ToNot(HaveOccurred())
@@ -146,6 +145,7 @@ func InstallOperator(operator TestData) {
 		_, err = cmd.Kubectl("apply", "-f", operator.ManifestsDir+manifest)
 		Expect(err).ToNot(HaveOccurred())
 	}
+	cmd.Kubectl("apply", "-f", fmt.Sprintf("%s/scc.yaml", operator.ManifestsDir)) //ignore the error to be able to run the test against none OCP clusters as well
 	deployment.GetEventually(types.NamespacedName{Namespace: operator.Ns, Name: "nmstate-operator"}).Should(deployment.BeReady())
 }