Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 2, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
1 change: 1 addition & 0 deletions deploy/chart/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
apiVersion: v2
description: A Helm chart for Kubernetes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this description verbose enough?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the original description from 2017. If we decide to include the chart as part of the release (as opposed to only using it for templating internally) then it should definitely be improved, but I don't think it needs to be touched as part of this PR.

name: olm
version: 0.0.0-dev

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion deploy/chart/values.yaml
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ minKubeVersion: 1.11.0
writeStatusName: '""'
imagestream: false
debug: false
e2eLocalMode: false
installType: upstream
olm:
replicaCount: 1
9 changes: 0 additions & 9 deletions e2e-local-run.Dockerfile

This file was deleted.

25 changes: 2 additions & 23 deletions e2e.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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 (
Loading