Skip to content

Commit fdc713e

Browse files
committed
Merge remote-tracking branch 'origin/main' into support-extra-flags-in-mysqld-exporter
2 parents eac877c + 6fc3db3 commit fdc713e

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
sigs.k8s.io/controller-runtime v0.19.0
2323
sigs.k8s.io/controller-tools v0.16.1
2424
sigs.k8s.io/kustomize v2.0.3+incompatible
25-
vitess.io/vitess v0.10.3-0.20241019094625-aba477f42aa0
25+
vitess.io/vitess v0.10.3-0.20241109143445-655f7fa15b09
2626
)
2727

2828
require (

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,5 +833,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77Vzej
833833
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
834834
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
835835
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
836-
vitess.io/vitess v0.10.3-0.20241019094625-aba477f42aa0 h1:eLsCorm6He8vlPaRlv0y8L42xHf7Z9p7wvGnQWqaghE=
837-
vitess.io/vitess v0.10.3-0.20241019094625-aba477f42aa0/go.mod h1:f+eDnWAcHRMo9p6G03lfdgcZtDTq+u9PukALsi6KezU=
836+
vitess.io/vitess v0.10.3-0.20241109143445-655f7fa15b09 h1:jBK52K2f0N7WNL0Dsmy2+mZ/SvfjP+HhfwbSL70wPc4=
837+
vitess.io/vitess v0.10.3-0.20241109143445-655f7fa15b09/go.mod h1:f+eDnWAcHRMo9p6G03lfdgcZtDTq+u9PukALsi6KezU=

test/endtoend/operator/101_initial_cluster.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ metadata:
88
name: example
99
spec:
1010
images:
11-
vtctld: vitess/lite:v21.0.0-rc1
12-
vtgate: vitess/lite:v21.0.0-rc1
13-
vttablet: vitess/lite:v21.0.0-rc1
14-
vtorc: vitess/lite:v21.0.0-rc1
15-
vtbackup: vitess/lite:v21.0.0-rc1
11+
vtctld: vitess/lite:v21.0.0
12+
vtgate: vitess/lite:v21.0.0
13+
vttablet: vitess/lite:v21.0.0
14+
vtorc: vitess/lite:v21.0.0
15+
vtbackup: vitess/lite:v21.0.0
1616
mysqld:
1717
mysql80Compatible: mysql:8.0.30
1818
mysqldExporter: prom/mysqld-exporter:v0.11.0

test/endtoend/operator/operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6993,7 +6993,7 @@ spec:
69936993
fieldPath: metadata.name
69946994
- name: OPERATOR_NAME
69956995
value: vitess-operator
6996-
image: planetscale/vitess-operator:v2.14.0-rc1
6996+
image: planetscale/vitess-operator:v2.14.0
69976997
name: vitess-operator
69986998
resources:
69996999
limits:

0 commit comments

Comments
 (0)