Skip to content

Commit 03a75e5

Browse files
eleo007eleo007
authored
K8SPS-510: Release 0.12.0
K8SPS-510: Release 0.12.0
2 parents 13f8427 + 4d92de6 commit 03a75e5

38 files changed

+257
-206
lines changed

‎.github/workflows/reviewdog.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ jobs:
8787
with:
8888
go-version: '^1.24'
8989
- name: check on release branch
90-
if: ${{ contains(github.head_ref, 'release-') || contains(github.base_ref, 'release-') }}
90+
if: ${{ contains(github.base_ref, 'release-') }}
9191
run: |
9292
make generate manifests VERSION="$(grep -Eo "[0-9]+\.[0-9]+\.[0-9]+" pkg/version/version.txt)" IMAGE_TAG_BASE="percona/percona-server-mysql-operator"
9393
git diff --exit-code
9494
- name: check on non release branches
95-
if: ${{ ! (contains(github.head_ref, 'release-') || contains(github.base_ref, 'release-')) }}
95+
if: ${{ ! contains(github.base_ref, 'release-') }}
9696
run: |
9797
make generate manifests VERSION=main
9898
git diff --exit-code

‎Makefile‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,10 @@ catalog-build: opm ## Build a catalog image.
252252
catalog-push: ## Push a catalog image.
253253
$(MAKE) docker-push IMG=$(CATALOG_IMG)
254254

255+
.PHONY: update-version
256+
update-version:
257+
echo $(NEXT_VER) > pkg/version/version.txt
258+
255259
# Prepare release
256260
include e2e-tests/release_versions
257261
CERT_MANAGER_VER := $(shell grep -Eo "cert-manager v.*" go.mod|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")
@@ -260,37 +264,36 @@ release: manifests
260264
echo $(VERSION) > pkg/version/version.txt
261265
$(SED) -i \
262266
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
263-
-e "/^ mysql:/,/^ image:/{s#image: .*#image: $(IMAGE_MYSQL80)#}" \
267+
-e "/^ mysql:/,/^ image:/{s#image: .*#image: $(IMAGE_MYSQL84)#}" \
264268
-e "/^ haproxy:/,/^ image:/{s#image: .*#image: $(IMAGE_HAPROXY)#}" \
265-
-e "/^ router:/,/^ image:/{s#image: .*#image: $(IMAGE_ROUTER80)#}" \
269+
-e "/^ router:/,/^ image:/{s#image: .*#image: $(IMAGE_ROUTER84)#}" \
266270
-e "/^ orchestrator:/,/^ image:/{s#image: .*#image: $(IMAGE_ORCHESTRATOR)#}" \
267-
-e "/^ backup:/,/^ image:/{s#image: .*#image: $(IMAGE_BACKUP80)#}" \
271+
-e "/^ backup:/,/^ image:/{s#image: .*#image: $(IMAGE_BACKUP84)#}" \
268272
-e "/^ toolkit:/,/^ image:/{s#image: .*#image: $(IMAGE_TOOLKIT)#}" \
269-
-e "s#initImage: .*#initImage: percona/percona-server-mysql-operator:$(VERSION)#g" \
273+
-e "/initContainer:/,/image:/{s#image: .*#image: $(IMAGE_OPERATOR)#}" \
270274
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM_CLIENT)#}" \
271275
deploy/cr.yaml
272276
$(SED) -i \
273277
-e "s|image: .*|image: $(IMAGE_OPERATOR)|g" \
274278
config/manager/manager.yaml config/manager/cluster/manager.yaml
275279
$(SED) -i \
276-
-e "s|cr.Spec.InitImage = .*|cr.Spec.InitImage = \"$(IMAGE_OPERATOR)\"|g" \
280+
-e "s|cr.Spec.InitContainer.Image = .*|cr.Spec.InitContainer.Image = \"$(IMAGE_OPERATOR)\"|g" \
277281
pkg/controller/ps/suite_test.go
278282

279283
# Prepare main branch after release
280284
MAJOR_VER := $(shell grep -Eo "[0-9]+\.[0-9]+\.[0-9]+" pkg/version/version.txt|cut -d'.' -f1)
281285
MINOR_VER := $(shell grep -Eo "[0-9]+\.[0-9]+\.[0-9]+" pkg/version/version.txt|cut -d'.' -f2)
282286
NEXT_VER ?= $(MAJOR_VER).$$(($(MINOR_VER) + 1)).0
283-
after-release: manifests
284-
echo $(NEXT_VER) > pkg/version/version.txt
287+
after-release: update-version manifests
285288
$(SED) -i \
286289
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(NEXT_VER)/}" \
287-
-e "/^ mysql:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-psmysql8.0#}" \
290+
-e "/^ mysql:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-psmysql8.4#}" \
288291
-e "/^ haproxy:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-haproxy#}" \
289-
-e "/^ router:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-router8.0#}" \
292+
-e "/^ router:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-router8.4#}" \
290293
-e "/^ orchestrator:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-orchestrator#}" \
291-
-e "/^ backup:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-backup8.0#}" \
294+
-e "/^ backup:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-backup8.4#}" \
292295
-e "/^ toolkit:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-toolkit#}" \
293-
-e "s#initImage: .*#initImage: perconalab/percona-server-mysql-operator:main#g" \
296+
-e "/initContainer:/,/image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main#}" \
294297
-e "/^ pmm:/,/^ image:/{s#image: .*#image: perconalab/pmm-client:3-dev-latest#}" \
295298
deploy/cr.yaml
296299
$(SED) -i \

‎config/crd/patches/versionlabel_in_perconaserverformysql.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconaservermysqls.ps.percona.com
55
labels:
6-
app.kubernetes.io/version: v0.12.0
6+
app.kubernetes.io/version: v1.0.0
77
app.kubernetes.io/name: percona-server-crd
88
app.kubernetes.io/part-of: percona-server-mysql-operator
99
app.kubernetes.io/component: crd

‎config/crd/patches/versionlabel_in_perconaserverformysqlbackups.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconaservermysqlbackups.ps.percona.com
55
labels:
6-
app.kubernetes.io/version: v0.12.0
6+
app.kubernetes.io/version: v1.0.0
77
app.kubernetes.io/name: percona-server-crd
88
app.kubernetes.io/part-of: percona-server-mysql-operator
99
app.kubernetes.io/component: crd

‎config/crd/patches/versionlabel_in_perconaserverformysqlrestores.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconaservermysqlrestores.ps.percona.com
55
labels:
6-
app.kubernetes.io/version: v0.12.0
6+
app.kubernetes.io/version: v1.0.0
77
app.kubernetes.io/name: percona-server-crd
88
app.kubernetes.io/part-of: percona-server-mysql-operator
99
app.kubernetes.io/component: crd

‎config/manager/cluster/manager.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
resources:
5454
limits:
5555
cpu: 200m
56-
memory: 100Mi
56+
memory: 500Mi
5757
requests:
5858
cpu: 100m
5959
memory: 20Mi

‎config/manager/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
1212
kind: Kustomization
1313
images:
1414
- name: controller
15-
newName: percona/percona-server-mysql-operator
15+
newName: perconalab/percona-server-mysql-operator
1616
newTag: main
1717
- name: perconalab/percona-server-mysql-operator
1818
newName: perconalab/percona-server-mysql-operator

‎config/manager/manager.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ spec:
5656
resources:
5757
limits:
5858
cpu: 200m
59-
memory: 100Mi
59+
memory: 500Mi
6060
requests:
6161
cpu: 100m
6262
memory: 20Mi

‎deploy/bundle.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
app.kubernetes.io/component: crd
88
app.kubernetes.io/name: percona-server-crd
99
app.kubernetes.io/part-of: percona-server-mysql-operator
10-
app.kubernetes.io/version: v0.12.0
10+
app.kubernetes.io/version: v1.0.0
1111
name: perconaservermysqlbackups.ps.percona.com
1212
spec:
1313
group: ps.percona.com
@@ -1173,7 +1173,7 @@ metadata:
11731173
app.kubernetes.io/component: crd
11741174
app.kubernetes.io/name: percona-server-crd
11751175
app.kubernetes.io/part-of: percona-server-mysql-operator
1176-
app.kubernetes.io/version: v0.12.0
1176+
app.kubernetes.io/version: v1.0.0
11771177
name: perconaservermysqlrestores.ps.percona.com
11781178
spec:
11791179
group: ps.percona.com
@@ -2336,7 +2336,7 @@ metadata:
23362336
app.kubernetes.io/component: crd
23372337
app.kubernetes.io/name: percona-server-crd
23382338
app.kubernetes.io/part-of: percona-server-mysql-operator
2339-
app.kubernetes.io/version: v0.12.0
2339+
app.kubernetes.io/version: v1.0.0
23402340
name: perconaservermysqls.ps.percona.com
23412341
spec:
23422342
group: ps.percona.com
@@ -13484,7 +13484,7 @@ spec:
1348413484
resources:
1348513485
limits:
1348613486
cpu: 200m
13487-
memory: 100Mi
13487+
memory: 500Mi
1348813488
requests:
1348913489
cpu: 100m
1349013490
memory: 20Mi

‎deploy/cr.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
# proxy: false
2121
# proxySize: false
2222
# pause: false
23-
crVersion: 0.12.0
23+
crVersion: 1.0.0
2424
# enableVolumeExpansion: false
2525
secretsName: ps-cluster1-secrets
2626
sslSecretName: ps-cluster1-ssl

0 commit comments

Comments
 (0)