44
55SHELL := /bin/bash
66PKG := 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 {}) )
89CODEGEN := ./vendor/k8s.io/code-generator/generate_groups.sh
910MOCKGEN := ./scripts/generate_mocks.sh
1011counterfeiter := $(GOBIN ) /counterfeiter
1112mockgen := $(GOBIN ) /mockgen
12- IMAGE_REPO := quay.io/coreos /olm
13+ IMAGE_REPO := quay.io/operator-framework /olm
1314IMAGE_TAG ?= "dev"
1415KUBE_DEPS := api apiextensions-apiserver apimachinery code-generator kube-aggregator kubernetes
1516KUBE_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):
5151run-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
5858deploy-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`
6868setup-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
7373e2e :
@@ -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
162162release : ver=$(shell cat OLM_VERSION)
163163release :
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 ) )
175175package :
176176ifndef 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
0 commit comments