Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into support-extra-flags-i…
Browse files Browse the repository at this point in the history
…n-mysqld-exporter
  • Loading branch information
frouioui committed Nov 11, 2024
2 parents eac877c + 6fc3db3 commit fdc713e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
sigs.k8s.io/controller-runtime v0.19.0
sigs.k8s.io/controller-tools v0.16.1
sigs.k8s.io/kustomize v2.0.3+incompatible
vitess.io/vitess v0.10.3-0.20241019094625-aba477f42aa0
vitess.io/vitess v0.10.3-0.20241109143445-655f7fa15b09
)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -833,5 +833,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77Vzej
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
vitess.io/vitess v0.10.3-0.20241019094625-aba477f42aa0 h1:eLsCorm6He8vlPaRlv0y8L42xHf7Z9p7wvGnQWqaghE=
vitess.io/vitess v0.10.3-0.20241019094625-aba477f42aa0/go.mod h1:f+eDnWAcHRMo9p6G03lfdgcZtDTq+u9PukALsi6KezU=
vitess.io/vitess v0.10.3-0.20241109143445-655f7fa15b09 h1:jBK52K2f0N7WNL0Dsmy2+mZ/SvfjP+HhfwbSL70wPc4=
vitess.io/vitess v0.10.3-0.20241109143445-655f7fa15b09/go.mod h1:f+eDnWAcHRMo9p6G03lfdgcZtDTq+u9PukALsi6KezU=
10 changes: 5 additions & 5 deletions test/endtoend/operator/101_initial_cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ metadata:
name: example
spec:
images:
vtctld: vitess/lite:v21.0.0-rc1
vtgate: vitess/lite:v21.0.0-rc1
vttablet: vitess/lite:v21.0.0-rc1
vtorc: vitess/lite:v21.0.0-rc1
vtbackup: vitess/lite:v21.0.0-rc1
vtctld: vitess/lite:v21.0.0
vtgate: vitess/lite:v21.0.0
vttablet: vitess/lite:v21.0.0
vtorc: vitess/lite:v21.0.0
vtbackup: vitess/lite:v21.0.0
mysqld:
mysql80Compatible: mysql:8.0.30
mysqldExporter: prom/mysqld-exporter:v0.11.0
Expand Down
2 changes: 1 addition & 1 deletion test/endtoend/operator/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6993,7 +6993,7 @@ spec:
fieldPath: metadata.name
- name: OPERATOR_NAME
value: vitess-operator
image: planetscale/vitess-operator:v2.14.0-rc1
image: planetscale/vitess-operator:v2.14.0
name: vitess-operator
resources:
limits:
Expand Down

0 comments on commit fdc713e

Please sign in to comment.