Skip to content

Commit 85577cd

Browse files
horshors
authored
Merge pull request #2092 from percona/release-1.21.0
K8SPSMDB-1481 - Release 1.21.0
2 parents 84e29e7 + 974e04a commit 85577cd

File tree

50 files changed

+920
-275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+920
-275
lines changed

‎Makefile‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,13 @@ release: manifests
118118
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_MONGOD80)#}" \
119119
-e "/^ backup:/,/^ image:/{s#image: .*#image: $(IMAGE_BACKUP)#}" \
120120
-e "s#initImage: .*#initImage: percona/percona-server-mongodb-operator:$(VERSION)#g" \
121-
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM_CLIENT)#}" deploy/cr.yaml
121+
-e "/^ logcollector:/,/^ image:/{s#image: .*#image: $(IMAGE_LOGCOLLECTOR)#}" \
122+
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM3_CLIENT)#}" deploy/cr.yaml
122123
$(SED) -i \
123124
-e "s|perconalab/percona-server-mongodb-operator:main-mongod8.0|$(IMAGE_MONGOD80)|g" \
124125
-e "s|perconalab/percona-server-mongodb-operator:main-backup|$(IMAGE_BACKUP)|g" \
125126
-e "s|perconalab/percona-server-mongodb-operator:main|$(IMAGE_OPERATOR)|g" \
127+
-e "s|perconalab/fluentbit:main-logcollector|$(IMAGE_LOGCOLLECTOR)|g" \
126128
pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/*.yaml
127129
$(SED) -i "s|cr.Spec.InitImage = \".*\"|cr.Spec.InitImage = \"${IMAGE_OPERATOR}\"|g" pkg/controller/perconaservermongodb/suite_test.go
128130

@@ -132,7 +134,7 @@ MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[
132134
MINOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f2)
133135
NEXT_VER ?= $(MAJOR_VER).$$(($(MINOR_VER) + 1)).0
134136
after-release: manifests
135-
$(SED) -i "/Version = \"/s/Version = \".*/Version = \"$(NEXT_VER)\"/" version/version.go
137+
echo $(NEXT_VER) > pkg/version/version.txt
136138
$(SED) -i \
137139
-e "s/crVersion: .*/crVersion: $(NEXT_VER)/" \
138140
-e "/^spec:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod8.0#}" deploy/cr-minimal.yaml
@@ -141,11 +143,13 @@ after-release: manifests
141143
-e "/^spec:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod8.0#}" \
142144
-e "/^ backup:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-backup#}" \
143145
-e "s#initImage: .*#initImage: perconalab/percona-server-mongodb-operator:main#g" \
144-
-e "/^ pmm:/,/^ image:/{s#image: .*#image: perconalab/pmm-client:dev-latest#}" deploy/cr.yaml
146+
-e "/^ logcollector:/,/^ image:/{s#image: .*#image: perconalab/fluentbit:main-logcollector#}" \
147+
-e "/^ pmm:/,/^ image:/{s#image: .*#image: perconalab/pmm-client:3-dev-latest#}" deploy/cr.yaml
145148
$(SED) -i \
146149
-e "s|$(IMAGE_MONGOD80)|perconalab/percona-server-mongodb-operator:main-mongod8.0|g" \
147150
-e "s|$(IMAGE_BACKUP)|perconalab/percona-server-mongodb-operator:main-backup|g" \
148151
-e "s|$(IMAGE_OPERATOR)|perconalab/percona-server-mongodb-operator:main|g" \
152+
-e "s|$(IMAGE_LOGCOLLECTOR)|perconalab/fluentbit:main-logcollector|g" \
149153
pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/*.yaml
150154
$(SED) -i "s|cr.Spec.InitImage = \".*\"|cr.Spec.InitImage = \"perconalab/percona-server-mongodb-operator:main\"|g" pkg/controller/perconaservermongodb/suite_test.go
151155

‎config/crd/patches/versionlabel_in_psmdb.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ metadata:
44
name: perconaservermongodbs.psmdb.percona.com
55
labels:
66
app.kubernetes.io/name: percona-server-mongodb
7-
app.kubernetes.io/version: v1.21.0
7+
app.kubernetes.io/version: v1.22.0
88
app.kubernetes.io/component: crd
99
app.kubernetes.io/part-of: percona-server-mongodb-operator

‎config/crd/patches/versionlabel_in_psmdbbackup.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ metadata:
44
name: perconaservermongodbbackups.psmdb.percona.com
55
labels:
66
app.kubernetes.io/name: percona-server-mongodb
7-
app.kubernetes.io/version: v1.21.0
7+
app.kubernetes.io/version: v1.22.0
88
app.kubernetes.io/component: crd
99
app.kubernetes.io/part-of: percona-server-mongodb-operator

‎config/crd/patches/versionlabel_in_psmdbrestore.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ metadata:
44
name: perconaservermongodbrestores.psmdb.percona.com
55
labels:
66
app.kubernetes.io/name: percona-server-mongodb
7-
app.kubernetes.io/version: v1.21.0
7+
app.kubernetes.io/version: v1.22.0
88
app.kubernetes.io/component: crd
99
app.kubernetes.io/part-of: percona-server-mongodb-operator

‎deploy/bundle.yaml‎

Lines changed: 3 additions & 3 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-mongodb
99
app.kubernetes.io/part-of: percona-server-mongodb-operator
10-
app.kubernetes.io/version: v1.21.0
10+
app.kubernetes.io/version: v1.22.0
1111
name: perconaservermongodbbackups.psmdb.percona.com
1212
spec:
1313
group: psmdb.percona.com
@@ -238,7 +238,7 @@ metadata:
238238
app.kubernetes.io/component: crd
239239
app.kubernetes.io/name: percona-server-mongodb
240240
app.kubernetes.io/part-of: percona-server-mongodb-operator
241-
app.kubernetes.io/version: v1.21.0
241+
app.kubernetes.io/version: v1.22.0
242242
name: perconaservermongodbrestores.psmdb.percona.com
243243
spec:
244244
group: psmdb.percona.com
@@ -479,7 +479,7 @@ metadata:
479479
app.kubernetes.io/component: crd
480480
app.kubernetes.io/name: percona-server-mongodb
481481
app.kubernetes.io/part-of: percona-server-mongodb-operator
482-
app.kubernetes.io/version: v1.21.0
482+
app.kubernetes.io/version: v1.22.0
483483
name: perconaservermongodbs.psmdb.percona.com
484484
spec:
485485
group: psmdb.percona.com

‎deploy/cr-minimal.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: PerconaServerMongoDB
33
metadata:
44
name: minimal-cluster
55
spec:
6-
crVersion: 1.21.0
6+
crVersion: 1.22.0
77
image: perconalab/percona-server-mongodb-operator:main-mongod8.0
88
unsafeFlags:
99
replsetSize: true

‎deploy/cr.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
# unmanaged: false
1515
# enableVolumeExpansion: false
1616
# enableExternalVolumeAutoscaling: false
17-
crVersion: 1.21.0
17+
crVersion: 1.22.0
1818
image: perconalab/percona-server-mongodb-operator:main-mongod8.0
1919
imagePullPolicy: Always
2020
# tls:
@@ -60,7 +60,7 @@ spec:
6060
# sse: my-cluster-name-sse
6161
pmm:
6262
enabled: false
63-
image: perconalab/pmm-client:dev-latest
63+
image: perconalab/pmm-client:3-dev-latest
6464
serverHost: monitoring-service
6565
# containerSecurityContext: {}
6666
# customClusterName: mongo-cluster

‎deploy/crd.yaml‎

Lines changed: 3 additions & 3 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-mongodb
99
app.kubernetes.io/part-of: percona-server-mongodb-operator
10-
app.kubernetes.io/version: v1.21.0
10+
app.kubernetes.io/version: v1.22.0
1111
name: perconaservermongodbbackups.psmdb.percona.com
1212
spec:
1313
group: psmdb.percona.com
@@ -238,7 +238,7 @@ metadata:
238238
app.kubernetes.io/component: crd
239239
app.kubernetes.io/name: percona-server-mongodb
240240
app.kubernetes.io/part-of: percona-server-mongodb-operator
241-
app.kubernetes.io/version: v1.21.0
241+
app.kubernetes.io/version: v1.22.0
242242
name: perconaservermongodbrestores.psmdb.percona.com
243243
spec:
244244
group: psmdb.percona.com
@@ -479,7 +479,7 @@ metadata:
479479
app.kubernetes.io/component: crd
480480
app.kubernetes.io/name: percona-server-mongodb
481481
app.kubernetes.io/part-of: percona-server-mongodb-operator
482-
app.kubernetes.io/version: v1.21.0
482+
app.kubernetes.io/version: v1.22.0
483483
name: perconaservermongodbs.psmdb.percona.com
484484
spec:
485485
group: psmdb.percona.com

‎deploy/cw-bundle.yaml‎

Lines changed: 3 additions & 3 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-mongodb
99
app.kubernetes.io/part-of: percona-server-mongodb-operator
10-
app.kubernetes.io/version: v1.21.0
10+
app.kubernetes.io/version: v1.22.0
1111
name: perconaservermongodbbackups.psmdb.percona.com
1212
spec:
1313
group: psmdb.percona.com
@@ -238,7 +238,7 @@ metadata:
238238
app.kubernetes.io/component: crd
239239
app.kubernetes.io/name: percona-server-mongodb
240240
app.kubernetes.io/part-of: percona-server-mongodb-operator
241-
app.kubernetes.io/version: v1.21.0
241+
app.kubernetes.io/version: v1.22.0
242242
name: perconaservermongodbrestores.psmdb.percona.com
243243
spec:
244244
group: psmdb.percona.com
@@ -479,7 +479,7 @@ metadata:
479479
app.kubernetes.io/component: crd
480480
app.kubernetes.io/name: percona-server-mongodb
481481
app.kubernetes.io/part-of: percona-server-mongodb-operator
482-
app.kubernetes.io/version: v1.21.0
482+
app.kubernetes.io/version: v1.22.0
483483
name: perconaservermongodbs.psmdb.percona.com
484484
spec:
485485
group: psmdb.percona.com

‎e2e-tests/default-cr/compare/statefulset_my-cluster-name-cfg-oc.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ spec:
112112
timeoutSeconds: 2
113113
resources:
114114
limits:
115-
cpu: 300m
116-
memory: 500M
115+
cpu: 600m
116+
memory: 1Gi
117117
requests:
118118
cpu: 300m
119-
memory: 500M
119+
memory: 1Gi
120120
securityContext:
121121
runAsNonRoot: true
122122
terminationMessagePath: /dev/termination-log
@@ -267,11 +267,11 @@ spec:
267267
name: mongo-init
268268
resources:
269269
limits:
270-
cpu: 300m
271-
memory: 500M
270+
cpu: 600m
271+
memory: 1Gi
272272
requests:
273273
cpu: 300m
274-
memory: 500M
274+
memory: 1Gi
275275
terminationMessagePath: /dev/termination-log
276276
terminationMessagePolicy: File
277277
volumeMounts:

0 commit comments

Comments
 (0)