Skip to content

Commit 0591651

Browse files
committed
test commit please ignore
This change gives the end-to-end test binary the ability, gated by build tags, to provision, deprovision, and perform test operation installation on test clusters. Without any tags, the default "provisioner" points to an existing cluster specified by either $KUBECONFIG, $HOME/.kube/config, or in-cluster service discovery. An alternate Kubernetes-in-Docker (kind) provisioner is available. The default installer is a no-op, but this commit also introduces an optional Helm installer, which installs the OLM chart (now built into the test binary). Provisioning, installation, and deprovisioning are run as part of the Ginkgo BeforeSuite/AfterSuite closures.
1 parent b4b160d commit 0591651

File tree

338 files changed

+38970
-11491
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

338 files changed

+38970
-11491
lines changed

deploy/chart/Chart.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
apiVersion: v2
22
description: A Helm chart for Kubernetes
33
name: olm
4+
version: 0.0.0-dev

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

-91
This file was deleted.

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

-10
This file was deleted.

deploy/chart/values.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ minKubeVersion: 1.11.0
66
writeStatusName: '""'
77
imagestream: false
88
debug: false
9-
e2eLocalMode: false
109
installType: upstream
1110
olm:
1211
replicaCount: 1

e2e-local-run.Dockerfile

-9
This file was deleted.

e2e.Dockerfile

+2-23
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,5 @@
1-
FROM golang:1.10 as builder
2-
LABEL stage=builder
3-
WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager
4-
RUN curl -L https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 -o /bin/jq
5-
RUN chmod +x /bin/jq
6-
# copy just enough of the git repo to parse HEAD, used to record version in OLM binaries
7-
COPY .git/HEAD .git/HEAD
8-
COPY .git/refs/heads/. .git/refs/heads
9-
RUN mkdir -p .git/objects
10-
COPY Makefile Makefile
11-
COPY OLM_VERSION OLM_VERSION
12-
COPY pkg pkg
13-
COPY vendor vendor
14-
COPY cmd cmd
15-
COPY test test
16-
RUN make build-coverage
17-
18-
FROM alpine:latest as olm
19-
LABEL stage=olm
20-
WORKDIR /
21-
COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/olm /bin/olm
22-
COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/catalog /bin/catalog
23-
COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/package-server /bin/package-server
1+
FROM scratch
2+
COPY olm catalog package-server wait cpb /bin/
243
EXPOSE 8080
254
EXPOSE 5443
265
CMD ["/bin/olm"]

go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require (
88
github.com/davecgh/go-spew v1.1.1
99
github.com/fsnotify/fsnotify v1.4.7
1010
github.com/ghodss/yaml v1.0.0
11+
github.com/go-bindata/go-bindata/v3 v3.1.3
1112
github.com/go-openapi/spec v0.19.4
1213
github.com/golang/mock v1.3.1
1314
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
@@ -24,7 +25,6 @@ require (
2425
github.com/sirupsen/logrus v1.4.2
2526
github.com/spf13/cobra v0.0.5
2627
github.com/stretchr/testify v1.4.0
27-
golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
2828
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
2929
google.golang.org/grpc v1.27.0
3030
gopkg.in/yaml.v2 v2.2.8
@@ -41,6 +41,7 @@ require (
4141
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
4242
rsc.io/letsencrypt v0.0.3 // indirect
4343
sigs.k8s.io/controller-tools v0.2.4
44+
sigs.k8s.io/kind v0.7.0
4445
)
4546

4647
replace (

0 commit comments

Comments
 (0)