Skip to content

CLOUD-881: Use release_versions in Makefile release rule #825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
May 30, 2025
Merged

CLOUD-881: Use release_versions in Makefile release rule #825

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9991bf8
CLOUD-881: Use release_versions in Makefile release rule
ptankov Jan 30, 2025
4823e1f
Update image references in Makefile release rule
ptankov Jan 30, 2025
2a328a6
disable telemetry, adding more files to be changes before and after r…
ptankov Jan 31, 2025
644ddf0
Merge branch 'main' into cloud-881
ptankov Feb 6, 2025
cc60cd0
Merge branch 'main' into cloud-881
ptankov Feb 11, 2025
f9f7768
Merge branch 'main' into cloud-881
ptankov Feb 17, 2025
d7e4ff3
Merge branch 'main' into cloud-881
ptankov Feb 17, 2025
808887c
Merge branch 'main' into cloud-881
egegunes Mar 11, 2025
4d966d8
Merge branch 'main' into cloud-881
hors May 23, 2025
ddcd09a
Update SED command
eleo007 May 27, 2025
3ef48ef
Merge branch 'main' into cloud-881
eleo007 May 27, 2025
f3a484e
Merge branch 'main' into cloud-881
hors May 27, 2025
0f9b697
WIP
eleo007 May 28, 2025
0da3211
WIP
eleo007 May 28, 2025
9a77dab
fix after-release rule
jvpasinatto May 28, 2025
8538d3e
fix deploy rule
jvpasinatto May 29, 2025
8d40dbb
Merge branch 'main' into cloud-881
jvpasinatto May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 36 additions & 20 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
SED := $(shell which gsed || which sed)
NAME ?= percona-server-mysql-operator
VERSION ?= $(shell git rev-parse --abbrev-ref HEAD | sed -e 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')
VERSION ?= $(shell git rev-parse --abbrev-ref HEAD | $(SED) -e 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')
ROOT_REPO ?= ${PWD}

# CHANNELS define the bundle channels used in the bundle.
Expand Down Expand Up @@ -106,7 +107,7 @@ manifests: kustomize generate
$(KUSTOMIZE) build config/crd/ > $(DEPLOYDIR)/crd.yaml
echo "---" >> $(DEPLOYDIR)/crd.yaml

$(KUSTOMIZE) build config/rbac/ | sed 's/ClusterRole/Role/g' > $(DEPLOYDIR)/rbac.yaml
$(KUSTOMIZE) build config/rbac/ | $(SED) 's/ClusterRole/Role/g' > $(DEPLOYDIR)/rbac.yaml
echo "---" >> $(DEPLOYDIR)/rbac.yaml
cd config/manager && $(KUSTOMIZE) edit set image perconalab/percona-server-mysql-operator=$(IMAGE)
$(KUSTOMIZE) build config/manager/ > $(DEPLOYDIR)/operator.yaml
Expand Down Expand Up @@ -146,11 +147,11 @@ uninstall: manifests ## Uninstall CRDs, rbac
kubectl delete -f $(DEPLOYDIR)/crd.yaml
kubectl delete -f $(DEPLOYDIR)/rbac.yaml

.PHONY: deploy
deploy: manifests ## Deploy operator
yq eval \
'(select(documentIndex==1).spec.template.spec.containers[] | select(.name=="manager").env[] | select(.name=="LOG_LEVEL").value) = "DEBUG"' \
$(DEPLOYDIR)/operator.yaml \
| kubectl apply -f -
'(select(documentIndex==1).spec.template.spec.containers[] | select(.name=="manager").env[] | select(.name=="LOG_LEVEL").value) = "DEBUG" | (select(documentIndex==1).spec.template.spec.containers[] | select(.name=="manager").env[] | select(.name=="DISABLE_TELEMETRY").value) = "true"' \
$(DEPLOYDIR)/operator.yaml | kubectl apply -f -

undeploy: manifests ## Undeploy operator
kubectl delete -f $(DEPLOYDIR)/operator.yaml
Expand Down Expand Up @@ -243,28 +244,36 @@ catalog-push: ## Push a catalog image.
$(MAKE) docker-push IMG=$(CATALOG_IMG)

# Prepare release
include e2e-tests/release_versions
CERT_MANAGER_VER := $(shell grep -Eo "cert-manager v.*" go.mod|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")
release: manifests
sed -i "/CERT_MANAGER_VER/s/CERT_MANAGER_VER=\".*/CERT_MANAGER_VER=\"$(CERT_MANAGER_VER)\"/" e2e-tests/vars.sh
sed -i "/const Version = \"/s/Version = \".*/Version = \"$(VERSION)\"/" pkg/version/version.go
sed -i \
$(SED) -i "/CERT_MANAGER_VER/s/CERT_MANAGER_VER=\".*/CERT_MANAGER_VER=\"$(CERT_MANAGER_VER)\"/" e2e-tests/vars.sh
echo $(VERSION) > pkg/version/version.txt
$(SED) -i \
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
-e "/^ mysql:/,/^ image:/{s#image: .*#image: percona/percona-server:@@SET_TAG@@#}" \
-e "/^ haproxy:/,/^ image:/{s#image: .*#image: percona/haproxy:@@SET_TAG@@#}" \
-e "/^ router:/,/^ image:/{s#image: .*#image: percona/percona-mysql-router:@@SET_TAG@@#}" \
-e "/^ orchestrator:/,/^ image:/{s#image: .*#image: percona/percona-orchestrator:@@SET_TAG@@#}" \
-e "/^ backup:/,/^ image:/{s#image: .*#image: percona/percona-xtrabackup:@@SET_TAG@@#}" \
-e "/^ toolkit:/,/^ image:/{s#image: .*#image: percona/percona-toolkit:@@SET_TAG@@#}" \
-e "/^ mysql:/,/^ image:/{s#image: .*#image: $(IMAGE_MYSQL80)#}" \
-e "/^ haproxy:/,/^ image:/{s#image: .*#image: $(IMAGE_HAPROXY)#}" \
-e "/^ router:/,/^ image:/{s#image: .*#image: $(IMAGE_ROUTER80)#}" \
-e "/^ orchestrator:/,/^ image:/{s#image: .*#image: $(IMAGE_ORCHESTRATOR)#}" \
-e "/^ backup:/,/^ image:/{s#image: .*#image: $(IMAGE_BACKUP80)#}" \
-e "/^ toolkit:/,/^ image:/{s#image: .*#image: $(IMAGE_TOOLKIT)#}" \
-e "s#initImage: .*#initImage: percona/percona-server-mysql-operator:$(VERSION)#g" \
-e "/^ pmm:/,/^ image:/{s#image: .*#image: percona/pmm-client:@@SET_TAG@@#}" deploy/cr.yaml
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM_CLIENT)#}" \
deploy/cr.yaml
$(SED) -i \
-e "s|image: .*|image: $(IMAGE_OPERATOR)|g" \
config/manager/manager.yaml config/manager/cluster/manager.yaml
$(SED) -i \
-e "s|cr.Spec.InitImage = .*|cr.Spec.InitImage = \"$(IMAGE_OPERATOR)\"|g" \
pkg/controller/ps/suite_test.go

# Prepare main branch after release
MAJOR_VER := $(shell grep "Version =" pkg/version/version.go|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f1)
MINOR_VER := $(shell grep "Version =" pkg/version/version.go|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f2)
MAJOR_VER := $(shell grep -Eo "[0-9]+\.[0-9]+\.[0-9]+" pkg/version/version.txt|cut -d'.' -f1)
MINOR_VER := $(shell grep -Eo "[0-9]+\.[0-9]+\.[0-9]+" pkg/version/version.txt|cut -d'.' -f2)
NEXT_VER ?= $(MAJOR_VER).$$(($(MINOR_VER) + 1)).0
after-release: manifests
sed -i "/const Version = \"/s/Version = \".*/Version = \"$(NEXT_VER)\"/" pkg/version/version.go
sed -i \
echo $(NEXT_VER) > pkg/version/version.txt
$(SED) -i \
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(NEXT_VER)/}" \
-e "/^ mysql:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-psmysql#}" \
-e "/^ haproxy:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-haproxy#}" \
Expand All @@ -273,4 +282,11 @@ after-release: manifests
-e "/^ backup:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-backup#}" \
-e "/^ toolkit:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-toolkit#}" \
-e "s#initImage: .*#initImage: perconalab/percona-server-mysql-operator:main#g" \
-e "/^ pmm:/,/^ image:/{s#image: .*#image: perconalab/pmm-client:dev-latest#}" deploy/cr.yaml
-e "/^ pmm:/,/^ image:/{s#image: .*#image: perconalab/pmm-client:3-dev-latest#}" \
deploy/cr.yaml
$(SED) -i \
-e "s|$(IMAGE_OPERATOR)|perconalab/percona-server-mysql-operator:main|g" \
config/manager/manager.yaml config/manager/cluster/manager.yaml deploy/bundle.yaml deploy/cw-bundle.yaml deploy/operator.yaml deploy/cw-operator.yaml
$(SED) -i \
-e "s|$(IMAGE_OPERATOR)|perconalab/percona-server-mysql-operator:main|g" \
pkg/controller/ps/suite_test.go
Loading