Skip to content

Commit 75006a8

Browse files
committed
Merge remote-tracking branch 'origin/main' into K8SPS-131
2 parents b4de758 + d61c487 commit 75006a8

15 files changed

+38
-38
lines changed

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.10.0
6+
app.kubernetes.io/version: v0.11.0
77
app.kubernetes.io/name: percona-server
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.10.0
6+
app.kubernetes.io/version: v0.11.0
77
app.kubernetes.io/name: percona-server
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.10.0
6+
app.kubernetes.io/version: v0.11.0
77
app.kubernetes.io/name: percona-server
88
app.kubernetes.io/part-of: percona-server-mysql-operator
99
app.kubernetes.io/component: crd

config/manager/cluster/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
1212
kind: Kustomization
1313
images:
1414
- name: perconalab/percona-server-mysql-operator
15-
newName: percona/percona-server-mysql-operator
16-
newTag: 0.10.0
15+
newName: perconalab/percona-server-mysql-operator
16+
newTag: main

config/manager/cluster/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
value: ""
3434
- name: DISABLE_TELEMETRY
3535
value: "false"
36-
image: percona/percona-server-mysql-operator:0.10.0
36+
image: perconalab/percona-server-mysql-operator:main
3737
imagePullPolicy: Always
3838
name: manager
3939
securityContext:

config/manager/kustomization.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ kind: Kustomization
1313
images:
1414
- name: controller
1515
newName: percona/percona-server-mysql-operator
16-
newTag: 0.10.0
16+
newTag: main
1717
- name: perconalab/percona-server-mysql-operator
18-
newName: percona/percona-server-mysql-operator
19-
newTag: 0.10.0
18+
newName: perconalab/percona-server-mysql-operator
19+
newTag: main

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
fieldPath: metadata.namespace
3737
- name: DISABLE_TELEMETRY
3838
value: "false"
39-
image: percona/percona-server-mysql-operator:0.10.0
39+
image: perconalab/percona-server-mysql-operator:main
4040
imagePullPolicy: Always
4141
name: manager
4242
securityContext:

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
99
app.kubernetes.io/part-of: percona-server-mysql-operator
10-
app.kubernetes.io/version: v0.10.0
10+
app.kubernetes.io/version: v0.11.0
1111
name: perconaservermysqlbackups.ps.percona.com
1212
spec:
1313
group: ps.percona.com
@@ -967,7 +967,7 @@ metadata:
967967
app.kubernetes.io/component: crd
968968
app.kubernetes.io/name: percona-server
969969
app.kubernetes.io/part-of: percona-server-mysql-operator
970-
app.kubernetes.io/version: v0.10.0
970+
app.kubernetes.io/version: v0.11.0
971971
name: perconaservermysqlrestores.ps.percona.com
972972
spec:
973973
group: ps.percona.com
@@ -1926,7 +1926,7 @@ metadata:
19261926
app.kubernetes.io/component: crd
19271927
app.kubernetes.io/name: percona-server
19281928
app.kubernetes.io/part-of: percona-server-mysql-operator
1929-
app.kubernetes.io/version: v0.10.0
1929+
app.kubernetes.io/version: v0.11.0
19301930
name: perconaservermysqls.ps.percona.com
19311931
spec:
19321932
group: ps.percona.com
@@ -11702,7 +11702,7 @@ spec:
1170211702
fieldPath: metadata.namespace
1170311703
- name: DISABLE_TELEMETRY
1170411704
value: "false"
11705-
image: percona/percona-server-mysql-operator:0.10.0
11705+
image: perconalab/percona-server-mysql-operator:main
1170611706
imagePullPolicy: Always
1170711707
livenessProbe:
1170811708
httpGet:

deploy/cr.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ spec:
1414
# proxy: false
1515
# proxySize: false
1616
# pause: false
17-
crVersion: 0.10.0
17+
crVersion: 0.11.0
1818
secretsName: cluster1-secrets
1919
sslSecretName: cluster1-ssl
2020
updateStrategy: SmartUpdate
2121
upgradeOptions:
2222
versionServiceEndpoint: https://check.percona.com
2323
apply: disabled
24-
# initImage: percona/percona-server-mysql-operator:0.10.0
24+
# initImage: perconalab/percona-server-mysql-operator:main
2525
# ignoreAnnotations:
2626
# - service.beta.kubernetes.io/aws-load-balancer-backend-protocol
2727
# ignoreLabels:
@@ -39,9 +39,9 @@ spec:
3939
mysql:
4040
clusterType: group-replication
4141
autoRecovery: true
42-
image: percona/percona-server:8.0.42-33
42+
image: perconalab/percona-server-mysql-operator:main-psmysql
4343
imagePullPolicy: Always
44-
# initImage: percona/percona-server-mysql-operator:0.10.0
44+
# initImage: perconalab/percona-server-mysql-operator:main
4545
size: 3
4646

4747
# env:
@@ -148,7 +148,7 @@ spec:
148148

149149
size: 3
150150

151-
image: percona/haproxy:2.8.14
151+
image: perconalab/percona-server-mysql-operator:main-haproxy
152152
imagePullPolicy: Always
153153

154154
resources:
@@ -255,9 +255,9 @@ spec:
255255

256256
router:
257257
enabled: false
258-
image: percona/percona-mysql-router:8.0.42
258+
image: perconalab/percona-server-mysql-operator:main-router
259259
imagePullPolicy: Always
260-
# initImage: percona/percona-server-mysql-operator:0.10.0
260+
# initImage: perconalab/percona-server-mysql-operator:main
261261
# ports:
262262
# - name: http
263263
# port: 8443
@@ -335,10 +335,10 @@ spec:
335335
orchestrator:
336336
enabled: false
337337

338-
image: percona/percona-orchestrator:3.2.6-17
338+
image: perconalab/percona-server-mysql-operator:main-orchestrator
339339
imagePullPolicy: Always
340340
# serviceAccountName: percona-server-mysql-operator-orchestrator
341-
# initImage: percona/percona-server-mysql-operator:0.10.0
341+
# initImage: perconalab/percona-server-mysql-operator:main
342342

343343
size: 3
344344

@@ -389,7 +389,7 @@ spec:
389389
pmm:
390390
enabled: false
391391

392-
image: percona/pmm-client:3.2.0
392+
image: perconalab/pmm-client:3-dev-latest
393393
imagePullPolicy: Always
394394

395395
resources:
@@ -405,7 +405,7 @@ spec:
405405

406406
backup:
407407
enabled: true
408-
image: percona/percona-xtrabackup:8.0.35-33
408+
image: perconalab/percona-server-mysql-operator:main-backup
409409
# schedule:
410410
# - name: "sat-night-backup"
411411
# schedule: "0 0 * * 6"
@@ -417,7 +417,7 @@ spec:
417417
# storageName: s3
418418
# backoffLimit: 6
419419
imagePullPolicy: Always
420-
# initImage: percona/percona-server-mysql-operator:0.10.0
420+
# initImage: perconalab/percona-server-mysql-operator:main
421421
# containerSecurityContext:
422422
# privileged: true
423423
storages:
@@ -470,7 +470,7 @@ spec:
470470
# prefix: ""
471471

472472
toolkit:
473-
image: percona/percona-toolkit:3.7.0
473+
image: perconalab/percona-server-mysql-operator:main-toolkit
474474
imagePullPolicy: Always
475475
# resources:
476476
# requests:

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
99
app.kubernetes.io/part-of: percona-server-mysql-operator
10-
app.kubernetes.io/version: v0.10.0
10+
app.kubernetes.io/version: v0.11.0
1111
name: perconaservermysqlbackups.ps.percona.com
1212
spec:
1313
group: ps.percona.com
@@ -967,7 +967,7 @@ metadata:
967967
app.kubernetes.io/component: crd
968968
app.kubernetes.io/name: percona-server
969969
app.kubernetes.io/part-of: percona-server-mysql-operator
970-
app.kubernetes.io/version: v0.10.0
970+
app.kubernetes.io/version: v0.11.0
971971
name: perconaservermysqlrestores.ps.percona.com
972972
spec:
973973
group: ps.percona.com
@@ -1926,7 +1926,7 @@ metadata:
19261926
app.kubernetes.io/component: crd
19271927
app.kubernetes.io/name: percona-server
19281928
app.kubernetes.io/part-of: percona-server-mysql-operator
1929-
app.kubernetes.io/version: v0.10.0
1929+
app.kubernetes.io/version: v0.11.0
19301930
name: perconaservermysqls.ps.percona.com
19311931
spec:
19321932
group: ps.percona.com

0 commit comments

Comments
 (0)