Skip to content

Commit c4890a1

Browse files
authored
chore: Fix k8s dependencies (#3339)
k8s.io/client-go v0.* is newer than v.1 https://github.com/kubernetes/client-go/blob/master/README.md Pinned a couple of others that seem to be the minimal set to get the build working
1 parent c7bf652 commit c4890a1

File tree

2 files changed

+169
-62
lines changed

2 files changed

+169
-62
lines changed

flow/go.mod

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/PeerDB-io/peerdb/flow
33
go 1.24.0
44

55
require (
6-
cloud.google.com/go v0.121.4
6+
cloud.google.com/go v0.121.5
77
cloud.google.com/go/bigquery v1.69.0
88
cloud.google.com/go/pubsub/v2 v2.0.0
99
cloud.google.com/go/storage v1.56.0
@@ -45,7 +45,7 @@ require (
4545
github.com/orcaman/concurrent-map/v2 v2.0.1
4646
github.com/pgvector/pgvector-go v0.3.0
4747
github.com/pingcap/tidb v0.0.0-20250130070702-43f2fb91d740
48-
github.com/pingcap/tidb/pkg/parser v0.0.0-20250811102254-4230cf349b01
48+
github.com/pingcap/tidb/pkg/parser v0.0.0-20250812121900-342a4c89a8ee
4949
github.com/shopspring/decimal v1.4.0
5050
github.com/slack-go/slack v0.17.3
5151
github.com/snowflakedb/gosnowflake v1.15.0
@@ -54,7 +54,7 @@ require (
5454
github.com/twmb/franz-go/pkg/kadm v1.16.1
5555
github.com/twmb/franz-go/plugin/kslog v1.0.0
5656
github.com/twpayne/go-geos v0.20.1
57-
github.com/urfave/cli/v3 v3.3.9
57+
github.com/urfave/cli/v3 v3.4.1
5858
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78
5959
github.com/yuin/gopher-lua v1.1.1
6060
go.mongodb.org/mongo-driver/v2 v2.2.3
@@ -65,19 +65,19 @@ require (
6565
go.opentelemetry.io/otel/metric v1.37.0
6666
go.opentelemetry.io/otel/sdk v1.37.0
6767
go.opentelemetry.io/otel/sdk/metric v1.37.0
68-
go.temporal.io/api v1.51.0
68+
go.temporal.io/api v1.52.0
6969
go.temporal.io/sdk v1.35.0
7070
go.temporal.io/sdk/contrib/opentelemetry v0.6.0
7171
go.uber.org/automaxprocs v1.6.0
7272
golang.org/x/crypto v0.41.0
7373
golang.org/x/exp v0.0.0-20250811191247-51f88131bc50
7474
golang.org/x/sync v0.16.0
75-
google.golang.org/api v0.246.0
76-
google.golang.org/genproto/googleapis/api v0.0.0-20250811160224-6b04f9b4fc78
75+
google.golang.org/api v0.247.0
76+
google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a
7777
google.golang.org/grpc v1.74.2
7878
google.golang.org/protobuf v1.36.7
7979
k8s.io/apimachinery v0.33.3
80-
k8s.io/client-go v1.5.2
80+
k8s.io/client-go v0.33.3 // Note: v0.* are newer than v1.*
8181
)
8282

8383
require (
@@ -100,6 +100,7 @@ require (
100100
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
101101
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
102102
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
103+
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
103104
github.com/VividCortex/ewma v1.2.0 // indirect
104105
github.com/andybalholm/brotli v1.2.0 // indirect
105106
github.com/apache/arrow-go/v18 v18.4.0 // indirect
@@ -168,7 +169,6 @@ require (
168169
github.com/google/flatbuffers v25.2.10+incompatible // indirect
169170
github.com/google/gnostic-models v0.7.0 // indirect
170171
github.com/google/go-cmp v0.7.0 // indirect
171-
github.com/google/gofuzz v1.2.0 // indirect
172172
github.com/google/s2a-go v0.1.9 // indirect
173173
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
174174
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
@@ -227,7 +227,7 @@ require (
227227
github.com/stretchr/objx v0.5.2 // indirect
228228
github.com/tiancaiamao/gp v0.0.0-20230126082955-4f9e4f1ed9b5 // indirect
229229
github.com/tikv/client-go/v2 v2.0.8-0.20250117034919-61e09c6539bd // indirect
230-
github.com/tikv/pd/client v0.0.0-20250811091115-e158918c8513 // indirect
230+
github.com/tikv/pd/client v0.0.0-20250812210442-fc7fee6d3ec2 // indirect
231231
github.com/tklauser/go-sysconf v0.3.15 // indirect
232232
github.com/tklauser/numcpus v0.10.0 // indirect
233233
github.com/twmb/franz-go/pkg/kmsg v1.11.2 // indirect
@@ -240,7 +240,6 @@ require (
240240
github.com/yusufpapurcu/wmi v1.2.4 // indirect
241241
github.com/zeebo/errs v1.4.0 // indirect
242242
github.com/zeebo/xxh3 v1.0.2 // indirect
243-
go.einride.tech/aip v0.73.0 // indirect
244243
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
245244
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
246245
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
@@ -254,7 +253,6 @@ require (
254253
go.uber.org/multierr v1.11.0 // indirect
255254
go.uber.org/zap v1.27.0 // indirect
256255
go.yaml.in/yaml/v2 v2.4.2 // indirect
257-
go.yaml.in/yaml/v3 v3.0.4 // indirect
258256
golang.org/x/mod v0.27.0 // indirect
259257
golang.org/x/net v0.43.0 // indirect
260258
golang.org/x/oauth2 v0.30.0 // indirect
@@ -264,15 +262,15 @@ require (
264262
golang.org/x/time v0.12.0 // indirect
265263
golang.org/x/tools v0.36.0 // indirect
266264
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
267-
google.golang.org/genproto v0.0.0-20250811160224-6b04f9b4fc78 // indirect
268-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250811160224-6b04f9b4fc78 // indirect
265+
google.golang.org/genproto v0.0.0-20250811230008-5f3141c8851a // indirect
266+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect
269267
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
270268
gopkg.in/inf.v0 v0.9.1 // indirect
271269
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
272270
gopkg.in/yaml.v3 v3.0.1 // indirect
273271
k8s.io/api v0.33.3 // indirect
274272
k8s.io/klog/v2 v2.130.1 // indirect
275-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
273+
k8s.io/kube-openapi v0.0.0-20250812141708-942b836dc350 // indirect
276274
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
277275
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
278276
sigs.k8s.io/randfill v1.0.0 // indirect
@@ -282,14 +280,7 @@ require (
282280

283281
replace github.com/tikv/client-go/v2 => github.com/PeerDB-io/tikv-client-go/v2 v2.0.7
284282

285-
replace k8s.io/api => k8s.io/api v0.32.3
283+
// These two are pinned until https://github.com/kubernetes/apimachinery/issues/190 is resolved and all k8s rolls over
284+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
286285

287-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.32.3
288-
289-
replace k8s.io/client-go => k8s.io/client-go v0.32.3
290-
291-
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911
292-
293-
replace k8s.io/utils => k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
294-
295-
replace sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.7.0
286+
replace github.com/google/gnostic-models => github.com/google/gnostic-models v0.6.9

0 commit comments

Comments
 (0)