Skip to content

Commit e7d6898

Browse files
frouiouifrouioui
authored
Merge pull request #712 from planetscale/bump-vt-deps
Upgrade Vitess dependencies to latest
2 parents 10bb431 + 67cc13f commit e7d6898

File tree

8 files changed

+261
-198
lines changed

8 files changed

+261
-198
lines changed

‎.buildkite/pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ agents:
22
queue: "public"
33

44
env:
5-
GO_VERSION_FILE: "go1.24.2.linux-amd64.tar.gz"
5+
GO_VERSION_FILE: "go1.24.4.linux-amd64.tar.gz"
66

77
# Mount the docker.sock as to the docker container, so that we are able to
88
# run docker build command and kind is spawned as a sibling container.

‎.github/workflows/integration-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v2
1919
with:
20-
go-version: 1.24.2
20+
go-version: 1.24.4
2121
id: go
2222

2323
- name: Check out code into the Go module directory

‎.github/workflows/make-generate-and-diff.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v2
1919
with:
20-
go-version: 1.24.2
20+
go-version: 1.24.4
2121
id: go
2222

2323
- name: Check out code into the Go module directory

‎.github/workflows/unit-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v2
1919
with:
20-
go-version: 1.24.2
20+
go-version: 1.24.4
2121
id: go
2222

2323
- name: Check out code into the Go module directory

‎.github/workflows/upgrade-vitess-dependency.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v2
2222
with:
23-
go-version: 1.24.2
23+
go-version: 1.24.4
2424

2525
- name: Check out code into the Go module directory
2626
uses: actions/checkout@v2

‎build/Dockerfile.release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# without messing up file permissions, since the Docker container doesn't run as
1212
# your actual user.
1313

14-
FROM golang:1.24.2 AS build
14+
FROM golang:1.24.4 AS build
1515

1616
ENV GO111MODULE=on
1717
WORKDIR /go/src/planetscale.dev/vitess-operator

‎go.mod‎

Lines changed: 76 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module planetscale.dev/vitess-operator
22

3-
go 1.24.2
3+
go 1.24.4
44

55
require (
66
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
77
github.com/google/uuid v1.6.0
88
github.com/planetscale/operator-sdk-libs v0.0.0-20220216002626-1af183733234
9-
github.com/prometheus/client_golang v1.21.1
9+
github.com/prometheus/client_golang v1.22.0
1010
github.com/robfig/cron v1.2.0
1111
github.com/sirupsen/logrus v1.9.3
1212
github.com/spf13/pflag v1.0.6
@@ -22,27 +22,27 @@ require (
2222
sigs.k8s.io/controller-runtime v0.20.2
2323
sigs.k8s.io/controller-tools v0.17.2
2424
sigs.k8s.io/kustomize v2.0.3+incompatible
25-
vitess.io/vitess v0.10.3-0.20250418051553-a8c0d32db1ab
25+
vitess.io/vitess v0.10.3-0.20250730074721-44615b179a05
2626
)
2727

2828
require (
29-
cel.dev/expr v0.22.0 // indirect
30-
cloud.google.com/go v0.119.0 // indirect
31-
cloud.google.com/go/auth v0.15.0 // indirect
32-
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
33-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
34-
cloud.google.com/go/iam v1.4.2 // indirect
35-
cloud.google.com/go/monitoring v1.24.1 // indirect
36-
cloud.google.com/go/storage v1.51.0 // indirect
29+
cel.dev/expr v0.24.0 // indirect
30+
cloud.google.com/go v0.121.1 // indirect
31+
cloud.google.com/go/auth v0.16.1 // indirect
32+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
33+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
34+
cloud.google.com/go/iam v1.5.2 // indirect
35+
cloud.google.com/go/monitoring v1.24.2 // indirect
36+
cloud.google.com/go/storage v1.54.0 // indirect
3737
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
3838
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
3939
github.com/Azure/azure-storage-blob-go v0.15.0 // indirect
40-
github.com/DataDog/appsec-internal-go v1.10.0 // indirect
41-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.1 // indirect
42-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.64.1 // indirect
40+
github.com/DataDog/appsec-internal-go v1.11.2 // indirect
41+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.65.1 // indirect
42+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.65.1 // indirect
4343
github.com/DataDog/datadog-go/v5 v5.6.0 // indirect
4444
github.com/DataDog/go-libddwaf/v3 v3.5.4 // indirect
45-
github.com/DataDog/go-sqllexer v0.1.3 // indirect
45+
github.com/DataDog/go-sqllexer v0.1.6 // indirect
4646
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
4747
github.com/DataDog/sketches-go v1.4.7 // indirect
4848
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
@@ -53,55 +53,64 @@ require (
5353
github.com/armon/go-metrics v0.4.1 // indirect
5454
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
5555
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
56-
github.com/aws/aws-sdk-go-v2/config v1.29.9 // indirect
57-
github.com/aws/aws-sdk-go-v2/credentials v1.17.62 // indirect
56+
github.com/aws/aws-sdk-go-v2/config v1.29.14 // indirect
57+
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
5858
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
59-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.66 // indirect
59+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.75 // indirect
6060
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
6161
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
6262
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
6363
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.34 // indirect
6464
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
65-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 // indirect
65+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.1 // indirect
6666
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
6767
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
68-
github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2 // indirect
69-
github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 // indirect
70-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 // indirect
71-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 // indirect
68+
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.3 // indirect
69+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
70+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
71+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
7272
github.com/aws/smithy-go v1.22.3 // indirect
7373
github.com/beorn7/perks v1.0.1 // indirect
7474
github.com/blang/semver/v4 v4.0.0 // indirect
7575
github.com/cespare/xxhash/v2 v2.3.0 // indirect
76-
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
76+
github.com/cilium/ebpf v0.16.0 // indirect
77+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
78+
github.com/containerd/cgroups v1.1.0 // indirect
79+
github.com/containerd/cgroups/v3 v3.0.5 // indirect
80+
github.com/containerd/log v0.1.0 // indirect
7781
github.com/coreos/go-semver v0.3.1 // indirect
7882
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7983
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8084
github.com/distribution/reference v0.6.0 // indirect
85+
github.com/docker/go-units v0.5.0 // indirect
8186
github.com/dustin/go-humanize v1.0.1 // indirect
8287
github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
83-
github.com/ebitengine/purego v0.8.2 // indirect
88+
github.com/ebitengine/purego v0.8.3 // indirect
8489
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
8590
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
8691
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
8792
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
8893
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
8994
github.com/fatih/color v1.18.0 // indirect
9095
github.com/felixge/httpsnoop v1.0.4 // indirect
91-
github.com/fsnotify/fsnotify v1.8.0 // indirect
96+
github.com/fsnotify/fsnotify v1.9.0 // indirect
9297
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
9398
github.com/gammazero/deque v1.0.0 // indirect
9499
github.com/ghodss/yaml v1.0.0 // indirect
100+
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
95101
github.com/go-logr/logr v1.4.2 // indirect
96102
github.com/go-logr/stdr v1.2.2 // indirect
97103
github.com/go-logr/zapr v1.3.0 // indirect
104+
github.com/go-ole/go-ole v1.2.6 // indirect
98105
github.com/go-openapi/jsonpointer v0.21.0 // indirect
99106
github.com/go-openapi/jsonreference v0.21.0 // indirect
100107
github.com/go-openapi/spec v0.21.0 // indirect
101108
github.com/go-openapi/swag v0.23.0 // indirect
109+
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
102110
github.com/gobuffalo/flect v1.0.3 // indirect
111+
github.com/godbus/dbus/v5 v5.1.0 // indirect
103112
github.com/gogo/protobuf v1.3.2 // indirect
104-
github.com/golang/glog v1.2.4 // indirect
113+
github.com/golang/glog v1.2.5 // indirect
105114
github.com/golang/protobuf v1.5.4 // indirect
106115
github.com/golang/snappy v1.0.0 // indirect
107116
github.com/google/btree v1.1.3 // indirect
@@ -112,10 +121,10 @@ require (
112121
github.com/google/safehtml v0.1.0 // indirect
113122
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
114123
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
115-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
124+
github.com/googleapis/gax-go/v2 v2.14.2 // indirect
116125
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
117126
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
118-
github.com/hashicorp/consul/api v1.31.2 // indirect
127+
github.com/hashicorp/consul/api v1.32.1 // indirect
119128
github.com/hashicorp/errwrap v1.1.0 // indirect
120129
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
121130
github.com/hashicorp/go-hclog v1.6.3 // indirect
@@ -127,14 +136,13 @@ require (
127136
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
128137
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
129138
github.com/hashicorp/golang-lru v1.0.2 // indirect
130-
github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
131139
github.com/hashicorp/serf v0.10.2 // indirect
132140
github.com/inconshreveable/mousetrap v1.1.0 // indirect
133141
github.com/josharian/intern v1.0.0 // indirect
134142
github.com/json-iterator/go v1.1.12 // indirect
135143
github.com/klauspost/compress v1.18.0 // indirect
136144
github.com/klauspost/pgzip v1.2.6 // indirect
137-
github.com/magiconair/properties v1.8.9 // indirect
145+
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
138146
github.com/mailru/easyjson v0.9.0 // indirect
139147
github.com/mattn/go-colorable v0.1.14 // indirect
140148
github.com/mattn/go-ieproxy v0.0.12 // indirect
@@ -143,48 +151,56 @@ require (
143151
github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1 // indirect
144152
github.com/mitchellh/go-homedir v1.1.0 // indirect
145153
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
154+
github.com/moby/sys/userns v0.1.0 // indirect
146155
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
147156
github.com/modern-go/reflect2 v1.0.2 // indirect
148157
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
149158
github.com/olekukonko/tablewriter v0.0.5 // indirect
150159
github.com/opencontainers/go-digest v1.0.0 // indirect
151-
github.com/opentracing-contrib/go-grpc v0.1.1 // indirect
160+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
161+
github.com/opentracing-contrib/go-grpc v0.1.2 // indirect
152162
github.com/opentracing/opentracing-go v1.2.0 // indirect
153163
github.com/outcaste-io/ristretto v0.2.3 // indirect
154164
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
155-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
165+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
156166
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
157167
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
158-
github.com/pires/go-proxyproto v0.8.0 // indirect
168+
github.com/pires/go-proxyproto v0.8.1 // indirect
159169
github.com/pkg/errors v0.9.1 // indirect
160170
github.com/planetscale/pargzip v0.0.0-20201116224723-90c7fc03ea8a // indirect
161171
github.com/planetscale/vtprotobuf v0.6.1-0.20241121165744-79df5c4772f2 // indirect
162172
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
163-
github.com/prometheus/client_model v0.6.1 // indirect
173+
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
174+
github.com/prometheus/client_model v0.6.2 // indirect
164175
github.com/prometheus/common v0.63.0 // indirect
165-
github.com/prometheus/procfs v0.15.1 // indirect
176+
github.com/prometheus/procfs v0.16.1 // indirect
166177
github.com/rivo/uniseg v0.4.7 // indirect
167178
github.com/russross/blackfriday/v2 v2.1.0 // indirect
168179
github.com/ryanuber/go-glob v1.0.0 // indirect
169-
github.com/sagikazarmark/locafero v0.7.0 // indirect
170-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
180+
github.com/sagikazarmark/locafero v0.9.0 // indirect
171181
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
182+
github.com/shirou/gopsutil/v4 v4.25.4 // indirect
172183
github.com/sourcegraph/conc v0.3.0 // indirect
173-
github.com/spf13/afero v1.12.0 // indirect
174-
github.com/spf13/cast v1.7.1 // indirect
184+
github.com/spf13/afero v1.14.0 // indirect
185+
github.com/spf13/cast v1.8.0 // indirect
175186
github.com/spf13/cobra v1.9.1 // indirect
176187
github.com/spf13/jwalterweatherman v1.1.0 // indirect
177-
github.com/spf13/viper v1.19.0 // indirect
188+
github.com/spf13/viper v1.20.1 // indirect
189+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
178190
github.com/subosito/gotenv v1.6.0 // indirect
179-
github.com/tinylib/msgp v1.2.5 // indirect
191+
github.com/tinylib/msgp v1.3.0 // indirect
192+
github.com/tklauser/go-sysconf v0.3.12 // indirect
193+
github.com/tklauser/numcpus v0.6.1 // indirect
180194
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
181195
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
182196
github.com/x448/float16 v0.8.4 // indirect
183197
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
198+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
184199
github.com/z-division/go-zookeeper v1.0.0 // indirect
185-
go.etcd.io/etcd/api/v3 v3.5.19 // indirect
186-
go.etcd.io/etcd/client/pkg/v3 v3.5.19 // indirect
187-
go.etcd.io/etcd/client/v3 v3.5.19 // indirect
200+
github.com/zeebo/errs v1.4.0 // indirect
201+
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
202+
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
203+
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
188204
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
189205
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
190206
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
@@ -197,25 +213,25 @@ require (
197213
go.uber.org/atomic v1.11.0 // indirect
198214
go.uber.org/multierr v1.11.0 // indirect
199215
go.uber.org/zap v1.27.0 // indirect
200-
golang.org/x/crypto v0.36.0 // indirect
201-
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
216+
golang.org/x/crypto v0.38.0 // indirect
217+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
202218
golang.org/x/mod v0.24.0 // indirect
203-
golang.org/x/net v0.37.0 // indirect
204-
golang.org/x/oauth2 v0.28.0 // indirect
205-
golang.org/x/sync v0.12.0 // indirect
206-
golang.org/x/sys v0.31.0 // indirect
207-
golang.org/x/term v0.30.0 // indirect
208-
golang.org/x/text v0.23.0 // indirect
219+
golang.org/x/net v0.40.0 // indirect
220+
golang.org/x/oauth2 v0.30.0 // indirect
221+
golang.org/x/sync v0.14.0 // indirect
222+
golang.org/x/sys v0.33.0 // indirect
223+
golang.org/x/term v0.32.0 // indirect
224+
golang.org/x/text v0.25.0 // indirect
209225
golang.org/x/time v0.11.0 // indirect
210-
golang.org/x/tools v0.31.0 // indirect
226+
golang.org/x/tools v0.33.0 // indirect
211227
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
212228
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
213-
google.golang.org/api v0.226.0 // indirect
214-
google.golang.org/genproto v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
215-
google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
216-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
217-
google.golang.org/grpc v1.71.0 // indirect
218-
google.golang.org/protobuf v1.36.5 // indirect
229+
google.golang.org/api v0.233.0 // indirect
230+
google.golang.org/genproto v0.0.0-20250512202823-5a2f75b736a9 // indirect
231+
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9 // indirect
232+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 // indirect
233+
google.golang.org/grpc v1.72.1 // indirect
234+
google.golang.org/protobuf v1.36.6 // indirect
219235
gopkg.in/DataDog/dd-trace-go.v1 v1.69.1 // indirect
220236
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
221237
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)