Merge pull request openshift#249 from creydr/apply-security-context-c…

…onstraints-on-reinstalling-operator-in-test

Bug 2023950: Fix operator e2e test for OCP

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/nmstate_install_test.go

@@ -92,7 +92,7 @@ var _ = Describe("NMState operator", func() {
 
 func installOperator(operator operatorTestData) error {
 	By(fmt.Sprintf("Creating NMState operator with namespace '%s'", operator.ns))
-	_, err := cmd.Run("make", false, fmt.Sprintf("OPERATOR_NAMESPACE=%s", operator.ns), fmt.Sprintf("HANDLER_NAMESPACE=%s", operator.ns), "IMAGE_REGISTRY=registry:5000", "manifests")
+	_, err := cmd.Run("make", false, fmt.Sprintf("OPERATOR_NAMESPACE=%s", operator.ns), fmt.Sprintf("HANDLER_NAMESPACE=%s", operator.ns), "manifests")
 	Expect(err).ToNot(HaveOccurred())
 
 	manifestsDir := "build/_output/manifests/"
@@ -101,6 +101,8 @@ func installOperator(operator operatorTestData) error {
 		_, err = cmd.Kubectl("apply", "-f", manifestsDir+manifest)
 		Expect(err).ToNot(HaveOccurred())
 	}
+	cmd.Kubectl("apply", "-f", fmt.Sprintf("%s/scc.yaml", 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())
 
 	return nil