Merge pull request #1410 from benluddy/e2e-go

End-to-end test binary can set up test clusters

Author: openshift-merge-robot

Diff for: deploy/chart/Chart.yaml

@@ -1,3 +1,4 @@
 apiVersion: v2
 description: A Helm chart for Kubernetes
 name: olm
+version: 0.0.0-dev

Diff for: deploy/chart/templates/e2e-local-01-openshift-config-proxy-crd.yaml

@@ -6,7 +6,6 @@ minKubeVersion: 1.11.0
 writeStatusName: '""'
 imagestream: false
 debug: false
-e2eLocalMode: false
 installType: upstream
 olm:
   replicaCount: 1

Diff for: deploy/chart/templates/e2e-local-02-openshift-cluster-proxy-cr.yaml

@@ -1,26 +1,5 @@
-FROM golang:1.10 as builder
-LABEL stage=builder
-WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager
-RUN curl -L https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 -o /bin/jq
-RUN chmod +x /bin/jq
-# copy just enough of the git repo to parse HEAD, used to record version in OLM binaries
-COPY .git/HEAD .git/HEAD
-COPY .git/refs/heads/. .git/refs/heads
-RUN mkdir -p .git/objects
-COPY Makefile Makefile
-COPY OLM_VERSION OLM_VERSION
-COPY pkg pkg
-COPY vendor vendor
-COPY cmd cmd
-COPY test test
-RUN make build-coverage
-
-FROM alpine:latest as olm
-LABEL stage=olm
-WORKDIR /
-COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/olm /bin/olm
-COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/catalog /bin/catalog
-COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/package-server /bin/package-server
+FROM scratch
+COPY olm catalog package-server wait cpb /bin/
 EXPOSE 8080
 EXPOSE 5443
 CMD ["/bin/olm"]

Diff for: deploy/chart/values.yaml

@@ -8,6 +8,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/fsnotify/fsnotify v1.4.7
 	github.com/ghodss/yaml v1.0.0
+	github.com/go-bindata/go-bindata/v3 v3.1.3
 	github.com/go-openapi/spec v0.19.4
 	github.com/golang/mock v1.3.1
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
@@ -24,7 +25,6 @@ require (
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.5
 	github.com/stretchr/testify v1.4.0
-	golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 	google.golang.org/grpc v1.27.0
 	gopkg.in/yaml.v2 v2.2.8
@@ -41,6 +41,7 @@ require (
 	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
 	rsc.io/letsencrypt v0.0.3 // indirect
 	sigs.k8s.io/controller-tools v0.2.4
+	sigs.k8s.io/kind v0.7.0
 )
 
 replace (