Skip to content

Commit b7bbf0c

Browse files
committed
feat(make): add quickstart generation to release rule
- Add quickstart generation to release rule - Use operator-framework namespace for all image references - Support go 1.12 go modules flag
1 parent 8a49e62 commit b7bbf0c

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

Makefile

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
SHELL := /bin/bash
66
PKG := github.com/operator-framework/operator-lifecycle-manager
7-
CMDS := $(addprefix bin/, $(shell go list ./cmd/... | xargs -I{} basename {}))
7+
MOD_FLAGS := $(shell (go version | grep -q -E "1\.(11|12)") && echo -mod=vendor)
8+
CMDS := $(addprefix bin/, $(shell go list $(MOD_FLAGS) ./cmd/... | xargs -I{} basename {}))
89
CODEGEN := ./vendor/k8s.io/code-generator/generate_groups.sh
910
MOCKGEN := ./scripts/generate_mocks.sh
1011
counterfeiter := $(GOBIN)/counterfeiter
1112
mockgen := $(GOBIN)/mockgen
12-
IMAGE_REPO := quay.io/coreos/olm
13+
IMAGE_REPO := quay.io/operator-framework/olm
1314
IMAGE_TAG ?= "dev"
1415
KUBE_DEPS := api apiextensions-apiserver apimachinery code-generator kube-aggregator kubernetes
1516
KUBE_RELEASE := release-1.11
16-
MOD_FLAGS := $(shell (go version | grep -q 1.11) && echo -mod=vendor)
1717

1818
.PHONY: build test run clean vendor schema-check \
1919
vendor-update coverage coverage-html e2e .FORCE
@@ -51,13 +51,13 @@ $(CMDS):
5151
run-local:
5252
. ./scripts/build_local.sh
5353
mkdir -p build/resources
54-
. ./scripts/package-release.sh 1.0.0 build/resources Documentation/install/local-values.yaml
54+
. ./scripts/package_release.sh 1.0.0 build/resources Documentation/install/local-values.yaml
5555
. ./scripts/install_local.sh local build/resources
5656
rm -rf build
5757

5858
deploy-local:
5959
mkdir -p build/resources
60-
. ./scripts/package-release.sh 1.0.0 build/resources Documentation/install/local-values.yaml
60+
. ./scripts/package_release.sh 1.0.0 build/resources Documentation/install/local-values.yaml
6161
. ./scripts/install_local.sh local build/resources
6262
rm -rf build
6363

@@ -67,7 +67,7 @@ e2e.namespace:
6767
# useful if running e2e directly with `go test -tags=bare`
6868
setup-bare: clean e2e.namespace
6969
. ./scripts/build_bare.sh
70-
. ./scripts/package-release.sh 1.0.0 test/e2e/resources test/e2e/e2e-bare-values.yaml
70+
. ./scripts/package_release.sh 1.0.0 test/e2e/resources test/e2e/e2e-bare-values.yaml
7171
. ./scripts/install_bare.sh $(shell cat ./e2e.namespace) test/e2e/resources
7272

7373
e2e:
@@ -161,8 +161,8 @@ gen-all: gen-ci container-codegen container-mockgen
161161
# then tag those builds in quay with the version in OLM_VERSION
162162
release: ver=$(shell cat OLM_VERSION)
163163
release:
164-
docker pull quay.io/coreos/olm:$(ver)
165-
$(MAKE) target=upstream ver=$(ver) package
164+
docker pull quay.io/operator-framework/olm:$(ver)
165+
$(MAKE) target=upstream ver=$(ver) quickstart=true package
166166
$(MAKE) target=okd ver=$(ver) package
167167
$(MAKE) target=ocp ver=$(ver) package
168168
rm -rf manifests
@@ -171,7 +171,7 @@ release:
171171
find ./manifests -type f -exec sed -i "/^#/d" {} \;
172172
find ./manifests -type f -exec sed -i "1{/---/d}" {} \;
173173

174-
package: olmref=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/coreos/olm:$(ver))
174+
package: olmref=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/operator-framework/olm:$(ver))
175175
package:
176176
ifndef target
177177
$(error target is undefined)
@@ -182,5 +182,8 @@ endif
182182
yq w -i deploy/$(target)/values.yaml olm.image.ref $(olmref)
183183
yq w -i deploy/$(target)/values.yaml catalog.image.ref $(olmref)
184184
yq w -i deploy/$(target)/values.yaml package.image.ref $(olmref)
185-
./scripts/package-release.sh $(ver) deploy/$(target)/manifests/$(ver) deploy/$(target)/values.yaml
185+
./scripts/package_release.sh $(ver) deploy/$(target)/manifests/$(ver) deploy/$(target)/values.yaml
186186
ln -sfFn ./$(ver) deploy/$(target)/manifests/latest
187+
ifeq ($(quickstart), true)
188+
./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/$(target)/manifests/quickstart/olm.yaml
189+
endif

upstream.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ COPY OLM_VERSION OLM_VERSION
1313
COPY pkg pkg
1414
COPY vendor vendor
1515
COPY go.mod go.mod
16+
COPY go.sum go.sum
1617
COPY cmd cmd
1718
COPY test test
1819
RUN make build

0 commit comments

Comments
 (0)