Skip to content

Commit 7050b21

Browse files
authored
Merge pull request #1774 from percona/cloud-881
CLOUD-881: Use release_versions in Makefile release rule
2 parents 44123aa + 03f0015 commit 7050b21

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,20 @@ swagger: ## Download swagger locally if necessary.
9999
$(call go-get-tool,$(SWAGGER),github.com/go-swagger/go-swagger/cmd/swagger@latest)
100100

101101
# Prepare release
102+
include e2e-tests/release_versions
102103
CERT_MANAGER_VER := $(shell grep -Eo "cert-manager v.*" go.mod|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")
103104
release: manifests
104105
$(SED) -i "/CERT_MANAGER_VER/s/CERT_MANAGER_VER=\".*/CERT_MANAGER_VER=\"$(CERT_MANAGER_VER)\"/" e2e-tests/functions
105106
$(SED) -i "/Version = \"/s/Version = \".*/Version = \"$(VERSION)\"/" version/version.go
106107
$(SED) -i \
107108
-e "s/crVersion: .*/crVersion: $(VERSION)/" \
108-
-e "/^spec:/,/^ image:/{s#image: .*#image: percona/percona-server-mongodb:@@SET_TAG@@#}" deploy/cr-minimal.yaml
109+
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_MONGOD70)#}" deploy/cr-minimal.yaml
109110
$(SED) -i \
110111
-e "s/crVersion: .*/crVersion: $(VERSION)/" \
111-
-e "/^spec:/,/^ image:/{s#image: .*#image: percona/percona-server-mongodb:@@SET_TAG@@#}" \
112-
-e "/^ backup:/,/^ image:/{s#image: .*#image: percona/percona-backup-mongodb:@@SET_TAG@@#}" \
112+
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_MONGOD70)#}" \
113+
-e "/^ backup:/,/^ image:/{s#image: .*#image: $(IMAGE_BACKUP)#}" \
113114
-e "s#initImage: .*#initImage: percona/percona-server-mongodb-operator:$(VERSION)#g" \
114-
-e "/^ pmm:/,/^ image:/{s#image: .*#image: percona/pmm-client:@@SET_TAG@@#}" deploy/cr.yaml
115+
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM_CLIENT)#}" deploy/cr.yaml
115116

116117
# Prepare main branch after release
117118
MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f1)

0 commit comments

Comments
 (0)