Skip to content

Commit 01f9dc6

Browse files
committed
chore(deploy): install helm in src image so that verify manifests
job can run
1 parent fc1711e commit 01f9dc6

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ RUN yum install -y make git
55
ENV GOPATH /go
66
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
77

8+
# install helm for templating - used in verification tests
9+
RUN curl -LO https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz && \
10+
tar -zxvf helm-v2.13.1-linux-amd64.tar.gz && \
11+
mv linux-amd64/helm /usr/local/bin/helm
12+
813
WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager
914

1015
# copy just enough of the git repo to parse HEAD, used to record version in OLM binaries
@@ -18,9 +23,11 @@ COPY pkg pkg
1823
COPY vendor vendor
1924
COPY cmd cmd
2025
COPY test test
26+
COPY scripts scripts
27+
COPY deploy deploy
28+
RUN make verify-manifests
2129
RUN make build
2230

23-
2431
FROM openshift/origin-base
2532

2633
ADD manifests/ /manifests

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,14 @@ container-mockgen:
154154
docker cp temp-mockgen:/operator-lifecycle-manager/pkg/package-server/client/fakes/. ./pkg/package-server/client/fakes
155155
docker rm temp-mockgen
156156

157+
verify: verify-codegen verify-manifests
158+
157159
# Must be run in gopath: https://github.com/kubernetes/kubernetes/issues/67566
158160
verify-codegen: codegen
159161
git diff --exit-code
160162

161163
# this is here for backwards compatibility with the ci job that calls verify-catalog
162-
verify-catalog: verify-manifests
164+
verify-catalog:
163165

164166
verify-manifests: ver=$(shell cat OLM_VERSION)
165167
verify-manifests:

0 commit comments

Comments
 (0)