Skip to content

Commit 0b59140

Browse files
Merge pull request #912 from ecordell/remove-helm
fix(build): don't use helm in src image
2 parents e1fd0d3 + d9d0ede commit 0b59140

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ 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-
138
WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager
149

1510
# copy just enough of the git repo to parse HEAD, used to record version in OLM binaries

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,11 @@ verify-codegen: codegen
162162
# this is here for backwards compatibility with the ci job that calls verify-catalog
163163
verify-catalog:
164164

165-
verify-manifests: ver=$(shell cat OLM_VERSION)
165+
# this is here for backwards compatibility with the ci job that calls verify-manifests
166166
verify-manifests:
167+
168+
verify-release: ver=$(shell cat OLM_VERSION)
169+
verify-release:
167170
rm -rf manifests
168171
mkdir manifests
169172
./scripts/package_release.sh $(ver) manifests deploy/ocp/values.yaml

0 commit comments

Comments
 (0)