Skip to content

Commit 1fc1e8b

Browse files
jvpasinattojvpasinatto
authored
K8SPSMDB-1498 Update versions for PSMDB 1.22.0 release (#2244)
* K8SPSMDB-1498 Update versions for PSMDB 1.22.0 release * Update Mongo 7.0 and Openshift release versions
1 parent f4079b8 commit 1fc1e8b

24 files changed

Lines changed: 378 additions & 112 deletions

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ release: manifests
127127
-e "s|perconalab/fluentbit:main-logcollector|$(IMAGE_LOGCOLLECTOR)|g" \
128128
pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/*.yaml
129129
$(SED) -i "s|cr.Spec.InitImage = \".*\"|cr.Spec.InitImage = \"${IMAGE_OPERATOR}\"|g" pkg/controller/perconaservermongodb/suite_test.go
130+
$(SED) -i "s|perconalab/percona-server-mongodb-operator:main-mongod8.0|$(IMAGE_MONGOD80)|g" pkg/psmdb/mongos_test.go
130131

131132
# Prepare main branch after release
132133
MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f1)
@@ -151,6 +152,7 @@ after-release: manifests
151152
-e "s|$(IMAGE_LOGCOLLECTOR)|perconalab/fluentbit:main-logcollector|g" \
152153
pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/*.yaml
153154
$(SED) -i "s|cr.Spec.InitImage = \".*\"|cr.Spec.InitImage = \"perconalab/percona-server-mongodb-operator:main\"|g" pkg/controller/perconaservermongodb/suite_test.go
155+
$(SED) -i "s|$(IMAGE_MONGOD80)|perconalab/percona-server-mongodb-operator:main-mongod8.0|g" pkg/psmdb/mongos_test.go
154156

155157
version-service-client: swagger
156158
curl https://raw.githubusercontent.com/Percona-Lab/percona-version-service/$(VS_BRANCH)/api/version.swagger.yaml \

‎deploy/bundle.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26706,7 +26706,7 @@ spec:
2670626706
serviceAccountName: percona-server-mongodb-operator
2670726707
containers:
2670826708
- name: percona-server-mongodb-operator
26709-
image: perconalab/percona-server-mongodb-operator:main
26709+
image: percona/percona-server-mongodb-operator:1.22.0
2671026710
imagePullPolicy: Always
2671126711
livenessProbe:
2671226712
failureThreshold: 3

‎deploy/cr-minimal.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: minimal-cluster
55
spec:
66
crVersion: 1.22.0
7-
image: perconalab/percona-server-mongodb-operator:main-mongod8.0
7+
image: percona/percona-server-mongodb:8.0.17-6
88
unsafeFlags:
99
replsetSize: true
1010
mongosSize: true

‎deploy/cr.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
# growthStep: 2Gi
2222
# maxSize: "10Gi"
2323
crVersion: 1.22.0
24-
image: perconalab/percona-server-mongodb-operator:main-mongod8.0
24+
image: percona/percona-server-mongodb:8.0.17-6
2525
imagePullPolicy: Always
2626
# tls:
2727
# mode: preferTLS
@@ -34,7 +34,7 @@ spec:
3434
# group: cert-manager.io
3535
# imagePullSecrets:
3636
# - name: private-registry-credentials
37-
# initImage: perconalab/percona-server-mongodb-operator:main
37+
# initImage: percona/percona-server-mongodb-operator:1.22.0
3838
# initContainerSecurityContext: {}
3939
# unsafeFlags:
4040
# tls: false
@@ -74,7 +74,7 @@ spec:
7474
# sse: my-cluster-name-sse
7575
pmm:
7676
enabled: false
77-
image: perconalab/pmm-client:3-dev-latest
77+
image: percona/pmm-client:3.6.0
7878
serverHost: monitoring-service
7979
# containerSecurityContext: {}
8080
# customClusterName: mongo-cluster
@@ -759,7 +759,7 @@ spec:
759759

760760
backup:
761761
enabled: true
762-
image: perconalab/percona-server-mongodb-operator:main-backup
762+
image: percona/percona-backup-mongodb:2.12.0
763763
# startingDeadlineSeconds: 300
764764
# hookScript:
765765
# configMapRef:
@@ -916,7 +916,7 @@ spec:
916916
# compressionLevel: 6
917917
logcollector:
918918
enabled: true
919-
image: perconalab/fluentbit:main-logcollector
919+
image: percona/fluentbit:4.0.1-2
920920
# configuration: |
921921
# [SERVICE]
922922
# Flush 1

‎deploy/cw-bundle.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26734,7 +26734,7 @@ spec:
2673426734
serviceAccountName: percona-server-mongodb-operator
2673526735
containers:
2673626736
- name: percona-server-mongodb-operator
26737-
image: perconalab/percona-server-mongodb-operator:main
26737+
image: percona/percona-server-mongodb-operator:1.22.0
2673826738
imagePullPolicy: Always
2673926739
livenessProbe:
2674026740
failureThreshold: 3

‎deploy/cw-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
serviceAccountName: percona-server-mongodb-operator
2626
containers:
2727
- name: percona-server-mongodb-operator
28-
image: perconalab/percona-server-mongodb-operator:main
28+
image: percona/percona-server-mongodb-operator:1.22.0
2929
imagePullPolicy: Always
3030
livenessProbe:
3131
failureThreshold: 3

‎deploy/operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
serviceAccountName: percona-server-mongodb-operator
2626
containers:
2727
- name: percona-server-mongodb-operator
28-
image: perconalab/percona-server-mongodb-operator:main
28+
image: percona/percona-server-mongodb-operator:1.22.0
2929
imagePullPolicy: Always
3030
livenessProbe:
3131
failureThreshold: 3

‎e2e-tests/functions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"percona/pmm-client:2.44.1-1"}
1717
IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:dev-latest"}
1818
IMAGE_PMM3_CLIENT=${IMAGE_PMM3_CLIENT:-"perconalab/pmm-client:3-dev-latest"}
1919
IMAGE_PMM3_SERVER=${IMAGE_PMM3_SERVER:-"perconalab/pmm-server:3-dev-latest"}
20-
CERT_MANAGER_VER="1.19.1"
20+
CERT_MANAGER_VER="1.19.3"
2121
MINIO_VER="5.4.0"
2222
CHAOS_MESH_VER="2.7.1"
2323
UPDATE_COMPARE_FILES=${UPDATE_COMPARE_FILES:-0}

‎e2e-tests/init-deploy/compare/statefulset_another-name-rs0-4-oc.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,56 @@ spec:
160160
resources: {}
161161
terminationMessagePath: /dev/termination-log
162162
terminationMessagePolicy: File
163+
- args:
164+
- pbm-agent-entrypoint
165+
command:
166+
- /opt/percona/pbm-entry.sh
167+
env:
168+
- name: PBM_AGENT_MONGODB_USERNAME
169+
valueFrom:
170+
secretKeyRef:
171+
key: MONGODB_BACKUP_USER_ESCAPED
172+
name: internal-another-name-users
173+
optional: false
174+
- name: PBM_AGENT_MONGODB_PASSWORD
175+
valueFrom:
176+
secretKeyRef:
177+
key: MONGODB_BACKUP_PASSWORD_ESCAPED
178+
name: internal-another-name-users
179+
optional: false
180+
- name: PBM_MONGODB_REPLSET
181+
value: rs0
182+
- name: PBM_MONGODB_PORT
183+
value: "27017"
184+
- name: PBM_AGENT_SIDECAR
185+
value: "true"
186+
- name: PBM_AGENT_SIDECAR_SLEEP
187+
value: "5"
188+
- name: POD_NAME
189+
valueFrom:
190+
fieldRef:
191+
apiVersion: v1
192+
fieldPath: metadata.name
193+
- name: PBM_MONGODB_URI
194+
value: mongodb://$(PBM_AGENT_MONGODB_USERNAME):$(PBM_AGENT_MONGODB_PASSWORD)@localhost:$(PBM_MONGODB_PORT)
195+
- name: PBM_AGENT_TLS_ENABLED
196+
value: "false"
197+
imagePullPolicy: Always
198+
name: backup-agent
199+
resources: {}
200+
securityContext:
201+
runAsNonRoot: true
202+
terminationMessagePath: /dev/termination-log
203+
terminationMessagePolicy: File
204+
volumeMounts:
205+
- mountPath: /etc/mongodb-ssl
206+
name: ssl
207+
readOnly: true
208+
- mountPath: /opt/percona
209+
name: bin
210+
readOnly: true
211+
- mountPath: /data/db
212+
name: mongod-data
163213
- args:
164214
- fluent-bit
165215
command:

‎e2e-tests/pvc-auto-resize/compare/statefulset_some-name-rs0-oc.yml‎

Lines changed: 216 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,216 @@
1+
apiVersion: apps/v1
2+
kind: StatefulSet
3+
metadata:
4+
annotations: {}
5+
generation: 1
6+
labels:
7+
app.kubernetes.io/component: mongod
8+
app.kubernetes.io/instance: some-name
9+
app.kubernetes.io/managed-by: percona-server-mongodb-operator
10+
app.kubernetes.io/name: percona-server-mongodb
11+
app.kubernetes.io/part-of: percona-server-mongodb
12+
app.kubernetes.io/replset: rs0
13+
name: some-name-rs0
14+
ownerReferences:
15+
- controller: true
16+
kind: PerconaServerMongoDB
17+
name: some-name
18+
spec:
19+
podManagementPolicy: OrderedReady
20+
replicas: 3
21+
revisionHistoryLimit: 10
22+
selector:
23+
matchLabels:
24+
app.kubernetes.io/component: mongod
25+
app.kubernetes.io/instance: some-name
26+
app.kubernetes.io/managed-by: percona-server-mongodb-operator
27+
app.kubernetes.io/name: percona-server-mongodb
28+
app.kubernetes.io/part-of: percona-server-mongodb
29+
app.kubernetes.io/replset: rs0
30+
serviceName: some-name-rs0
31+
template:
32+
metadata:
33+
annotations: {}
34+
labels:
35+
app.kubernetes.io/component: mongod
36+
app.kubernetes.io/instance: some-name
37+
app.kubernetes.io/managed-by: percona-server-mongodb-operator
38+
app.kubernetes.io/name: percona-server-mongodb
39+
app.kubernetes.io/part-of: percona-server-mongodb
40+
app.kubernetes.io/replset: rs0
41+
spec:
42+
containers:
43+
- args:
44+
- --bind_ip_all
45+
- --auth
46+
- --dbpath=/data/db
47+
- --port=27017
48+
- --replSet=rs0
49+
- --storageEngine=wiredTiger
50+
- --relaxPermChecks
51+
- --sslAllowInvalidCertificates
52+
- --clusterAuthMode=x509
53+
- --tlsMode=preferTLS
54+
- --enableEncryption
55+
- --encryptionKeyFile=/etc/mongodb-encryption/encryption-key
56+
- --wiredTigerCacheSizeGB=0.25
57+
- --wiredTigerIndexPrefixCompression=true
58+
- --quiet
59+
command:
60+
- /opt/percona/ps-entry.sh
61+
env:
62+
- name: SERVICE_NAME
63+
value: some-name
64+
- name: MONGODB_PORT
65+
value: "27017"
66+
- name: MONGODB_REPLSET
67+
value: rs0
68+
envFrom:
69+
- secretRef:
70+
name: internal-some-name-users
71+
optional: false
72+
imagePullPolicy: Always
73+
livenessProbe:
74+
exec:
75+
command:
76+
- /opt/percona/mongodb-healthcheck
77+
- k8s
78+
- liveness
79+
- --ssl
80+
- --sslInsecure
81+
- --sslCAFile
82+
- /etc/mongodb-ssl/ca.crt
83+
- --sslPEMKeyFile
84+
- /tmp/tls.pem
85+
- --startupDelaySeconds
86+
- "7200"
87+
failureThreshold: 4
88+
initialDelaySeconds: 60
89+
periodSeconds: 30
90+
successThreshold: 1
91+
timeoutSeconds: 10
92+
name: mongod
93+
ports:
94+
- containerPort: 27017
95+
name: mongodb
96+
protocol: TCP
97+
readinessProbe:
98+
exec:
99+
command:
100+
- /opt/percona/mongodb-healthcheck
101+
- k8s
102+
- readiness
103+
- --component
104+
- mongod
105+
- --ssl
106+
- --sslInsecure
107+
- --sslCAFile
108+
- /etc/mongodb-ssl/ca.crt
109+
- --sslPEMKeyFile
110+
- /tmp/tls.pem
111+
failureThreshold: 8
112+
initialDelaySeconds: 10
113+
periodSeconds: 3
114+
successThreshold: 1
115+
timeoutSeconds: 2
116+
resources:
117+
limits:
118+
cpu: 500m
119+
memory: 500M
120+
requests:
121+
cpu: 100m
122+
memory: 100M
123+
securityContext:
124+
runAsNonRoot: true
125+
terminationMessagePath: /dev/termination-log
126+
terminationMessagePolicy: File
127+
volumeMounts:
128+
- mountPath: /data/db
129+
name: mongod-data
130+
- mountPath: /etc/mongodb-secrets
131+
name: some-name-mongodb-keyfile
132+
readOnly: true
133+
- mountPath: /etc/mongodb-ssl
134+
name: ssl
135+
readOnly: true
136+
- mountPath: /etc/mongodb-ssl-internal
137+
name: ssl-internal
138+
readOnly: true
139+
- mountPath: /opt/percona
140+
name: bin
141+
- mountPath: /.mongodb
142+
name: mongosh
143+
- mountPath: /etc/mongodb-encryption
144+
name: some-name-mongodb-encryption-key
145+
readOnly: true
146+
- mountPath: /etc/users-secret
147+
name: users-secret-file
148+
workingDir: /data/db
149+
dnsPolicy: ClusterFirst
150+
initContainers:
151+
- command:
152+
- /init-entrypoint.sh
153+
imagePullPolicy: Always
154+
name: mongo-init
155+
resources:
156+
limits:
157+
cpu: 500m
158+
memory: 500M
159+
requests:
160+
cpu: 100m
161+
memory: 100M
162+
terminationMessagePath: /dev/termination-log
163+
terminationMessagePolicy: File
164+
volumeMounts:
165+
- mountPath: /data/db
166+
name: mongod-data
167+
- mountPath: /opt/percona
168+
name: bin
169+
restartPolicy: Always
170+
schedulerName: default-scheduler
171+
securityContext: {}
172+
serviceAccount: default
173+
serviceAccountName: default
174+
terminationGracePeriodSeconds: 60
175+
volumes:
176+
- name: some-name-mongodb-keyfile
177+
secret:
178+
defaultMode: 288
179+
optional: false
180+
secretName: some-name-mongodb-keyfile
181+
- emptyDir: {}
182+
name: bin
183+
- emptyDir: {}
184+
name: mongosh
185+
- name: some-name-mongodb-encryption-key
186+
secret:
187+
defaultMode: 288
188+
optional: false
189+
secretName: some-name-mongodb-encryption-key
190+
- name: ssl
191+
secret:
192+
defaultMode: 288
193+
optional: false
194+
secretName: some-name-ssl
195+
- name: ssl-internal
196+
secret:
197+
defaultMode: 288
198+
optional: true
199+
secretName: some-name-ssl-internal
200+
- name: users-secret-file
201+
secret:
202+
defaultMode: 420
203+
secretName: internal-some-name-users
204+
updateStrategy:
205+
type: OnDelete
206+
volumeClaimTemplates:
207+
- metadata:
208+
name: mongod-data
209+
spec:
210+
accessModes:
211+
- ReadWriteOnce
212+
resources:
213+
requests:
214+
storage: 1G
215+
status:
216+
phase: Pending

0 commit comments

Comments
 (0)