4
4
5
5
SHELL := /bin/bash
6
6
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 {}) )
8
9
CODEGEN := ./vendor/k8s.io/code-generator/generate_groups.sh
9
10
MOCKGEN := ./scripts/generate_mocks.sh
10
11
counterfeiter := $(GOBIN ) /counterfeiter
11
12
mockgen := $(GOBIN ) /mockgen
12
- IMAGE_REPO := quay.io/coreos /olm
13
+ IMAGE_REPO := quay.io/operator-framework /olm
13
14
IMAGE_TAG ?= "dev"
14
15
KUBE_DEPS := api apiextensions-apiserver apimachinery code-generator kube-aggregator kubernetes
15
16
KUBE_RELEASE := release-1.11
16
- MOD_FLAGS := $(shell (go version | grep -q 1.11) && echo -mod=vendor)
17
17
18
18
.PHONY : build test run clean vendor schema-check \
19
19
vendor-update coverage coverage-html e2e .FORCE
@@ -51,13 +51,13 @@ $(CMDS):
51
51
run-local :
52
52
. ./scripts/build_local.sh
53
53
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
55
55
. ./scripts/install_local.sh local build/resources
56
56
rm -rf build
57
57
58
58
deploy-local :
59
59
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
61
61
. ./scripts/install_local.sh local build/resources
62
62
rm -rf build
63
63
@@ -67,7 +67,7 @@ e2e.namespace:
67
67
# useful if running e2e directly with `go test -tags=bare`
68
68
setup-bare : clean e2e.namespace
69
69
. ./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
71
71
. ./scripts/install_bare.sh $(shell cat ./e2e.namespace) test/e2e/resources
72
72
73
73
e2e :
@@ -161,8 +161,8 @@ gen-all: gen-ci container-codegen container-mockgen
161
161
# then tag those builds in quay with the version in OLM_VERSION
162
162
release : ver=$(shell cat OLM_VERSION)
163
163
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
166
166
$(MAKE ) target=okd ver=$(ver ) package
167
167
$(MAKE ) target=ocp ver=$(ver ) package
168
168
rm -rf manifests
@@ -171,7 +171,7 @@ release:
171
171
find ./manifests -type f -exec sed -i " /^#/d" {} \;
172
172
find ./manifests -type f -exec sed -i " 1{/---/d}" {} \;
173
173
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 ) )
175
175
package :
176
176
ifndef target
177
177
$(error target is undefined)
@@ -182,5 +182,8 @@ endif
182
182
yq w -i deploy/$(target)/values.yaml olm.image.ref $(olmref)
183
183
yq w -i deploy/$(target)/values.yaml catalog.image.ref $(olmref)
184
184
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
186
186
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
0 commit comments