Merge pull request #41 from jsafrane/disable-default-install

Disable automatic installation of the operator in OpenShift

Author: openshift-merge-robot

Dockerfile

@@ -8,6 +8,6 @@ RUN useradd csi-operator
 COPY --from=builder /go/src/github.com/openshift/csi-operator/bin/csi-operator /usr/bin/
 COPY deploy/openshift/image-references deploy/prerequisites/*.yaml /manifests/
 COPY deploy/operator.yaml /manifests/99_operator.yaml
-LABEL io.openshift.release.operator true
+# LABEL io.openshift.release.operator true
 USER csi-operator
 ENTRYPOINT ["/usr/bin/csi-operator"]

Dockerfile.rhel7

@@ -8,6 +8,6 @@ RUN useradd csi-operator
 COPY --from=builder /go/src/github.com/openshift/csi-operator/bin/csi-operator /usr/bin/
 COPY deploy/openshift/image-references deploy/prerequisites/*.yaml /manifests/
 COPY deploy/operator.yaml /manifests/99_operator.yaml
-LABEL io.openshift.release.operator true
+# LABEL io.openshift.release.operator true
 USER csi-operator
 ENTRYPOINT ["/usr/bin/csi-operator"]

Makefile

@@ -37,6 +37,7 @@ verify:
 .PHONY: test-e2e
 # usage: KUBECONFIG=/var/run/kubernetes/admin.kubeconfig make test-e2e
 test-e2e: generate
+	hack/deploy-local.sh
 	go test -v ./test/e2e/... -kubeconfig=$(KUBECONFIG)  -root $(PWD) -globalMan deploy/prerequisites/01_crd.yaml
 
 .PHONY: container

hack/deploy-local.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Deploy the operator on a local cluster (reachable by kubectl).
+
+PROJECT_ROOT=$(dirname "${BASH_SOURCE}")/..
+
+if which kubectl &>/dev/null; then
+    CLI=kubectl
+elif which oc &>/dev/null; then
+    CLI=oc
+else
+    echo "Cannot find kubectl nor oc"
+    exit 1
+fi
+
+$CLI apply -f "${PROJECT_ROOT}/deploy/prerequisites/"
+$CLI apply -f "${PROJECT_ROOT}/deploy/operator.yaml"