Skip to content

Commit

Permalink
chore(deploy): install helm in src image so that verify manifests
Browse files Browse the repository at this point in the history
job can run
  • Loading branch information
ecordell committed May 9, 2019
1 parent c6af02c commit 49e737d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
9 changes: 8 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ RUN yum install -y make git
ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

# install helm for templating - used in verification tests
RUN curl -LO https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz && \
tar -zxvf helm-v2.13.1-linux-amd64.tar.gz && \
mv linux-amd64/helm /usr/local/bin/helm

WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager

# copy just enough of the git repo to parse HEAD, used to record version in OLM binaries
Expand All @@ -18,9 +23,11 @@ COPY pkg pkg
COPY vendor vendor
COPY cmd cmd
COPY test test
COPY scripts scripts
COPY deploy deploy
RUN make verify-manifests
RUN make build


FROM openshift/origin-base

ADD manifests/ /manifests
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,14 @@ container-mockgen:
docker cp temp-mockgen:/operator-lifecycle-manager/pkg/package-server/client/fakes/. ./pkg/package-server/client/fakes
docker rm temp-mockgen

verify: verify-codegen verify-manifests

# Must be run in gopath: https://github.com/kubernetes/kubernetes/issues/67566
verify-codegen: codegen
git diff --exit-code

# this is here for backwards compatibility with the ci job that calls verify-catalog
verify-catalog: verify-manifests
verify-catalog:

verify-manifests: ver=$(shell cat OLM_VERSION)
verify-manifests:
Expand Down

0 comments on commit 49e737d

Please sign in to comment.