Skip to content

Commit a04e80c

Browse files
mjudeikismjudeikis
committed
vendor fix
1 parent 50401ce commit a04e80c

3 files changed

Lines changed: 159 additions & 151 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,6 @@ fix-lint: $(GOLANGCI_LINT) ## Run golangci-lint with --fix
171171
GOLANGCI_LINT_FLAGS="--fix" $(MAKE) lint
172172
.PHONY: fix-lint
173173

174-
vendor: ## Vendor the dependencies
175-
go mod tidy
176-
go mod vendor
177-
.PHONY: vendor
178-
179174
tools: $(GOLANGCI_LINT) $(CONTROLLER_GEN) $(YAML_PATCH) $(GOTESTSUM) $(CODE_GENERATOR) ## Install tools
180175
.PHONY: tools
181176

@@ -199,7 +194,6 @@ $(KUBE_APPLYCONFIGURATION_GEN):
199194

200195

201196
codegen: $(CONTROLLER_GEN) $(YAML_PATCH) $(CODE_GENERATOR) $(KUBE_CLIENT_GEN) $(KUBE_LISTER_GEN) $(KUBE_INFORMER_GEN) $(KUBE_APPLYCONFIGURATION_GEN) ## Generate code
202-
go mod download
203197
./hack/update-codegen.sh
204198
$(MAKE) imports
205199
.PHONY: codegen
@@ -351,20 +345,9 @@ verify-imports: imports
351345
verify-go-versions:
352346
hack/verify-go-versions.sh
353347

354-
.PHONY: modules
355-
modules: ## Run go mod tidy to ensure modules are up to date
356-
for MOD in $(GOMODS); do \
357-
(cd $$MOD; echo "Tidying $$MOD"; go mod tidy); \
358-
done
359-
360-
.PHONY: verify-modules
361-
verify-modules: modules # Verify go modules are up to date
362-
@for MOD in $(GOMODS); do \
363-
(cd $$MOD; echo "Verifying $$MOD"; if ! git diff --quiet HEAD -- go.mod go.sum; then git diff -- go.mod go.sum; echo "[$$MOD] go modules are out of date, please run 'make modules'"; exit 1; fi; ) \
364-
done
365348

366349
.PHONY: verify
367-
verify: verify-modules verify-go-versions verify-imports verify-codegen verify-boilerplate ## verify formal properties of the code
350+
verify: verify-go-versions verify-imports verify-codegen verify-boilerplate ## verify formal properties of the code
368351

369352
.PHONY: help
370353
help: ## Show this help

‎go.mod‎

Lines changed: 70 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,26 @@ replace (
99
github.com/kube-bind/kube-bind/web => ./web
1010
)
1111

12+
// TODO: Cli already pulls 1.34 k/k. And because its downstream of this go mod, it will try to update intermediate deps
13+
// This should go away once we rebase to 1.34. But we are blocked by kcp.
14+
replace (
15+
github.com/google/gnostic-models => github.com/google/gnostic-models v0.6.9
16+
gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
17+
k8s.io/api => k8s.io/api v0.33.3
18+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.3
19+
k8s.io/apimachinery => k8s.io/apimachinery v0.33.3
20+
k8s.io/apiserver => k8s.io/apiserver v0.33.3
21+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.0
22+
k8s.io/client-go => k8s.io/client-go v0.33.3
23+
k8s.io/code-generator => k8s.io/code-generator v0.33.3
24+
k8s.io/component-base => k8s.io/component-base v0.33.3
25+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
26+
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.4.0
27+
)
28+
1229
require (
1330
github.com/coreos/go-oidc/v3 v3.16.0
31+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1432
github.com/dexidp/dex/api/v2 v2.3.0
1533
github.com/evanphx/json-patch/v5 v5.9.11
1634
github.com/golang-jwt/jwt/v5 v5.3.0
@@ -26,33 +44,33 @@ require (
2644
github.com/kube-bind/kube-bind/sdk v0.4.1
2745
github.com/kube-bind/kube-bind/web v0.0.0-00010101000000-000000000000
2846
github.com/martinlindhe/base36 v1.1.1
29-
github.com/spf13/cobra v1.9.1
30-
github.com/spf13/pflag v1.0.6
31-
github.com/stretchr/testify v1.10.0
47+
github.com/spf13/cobra v1.10.1
48+
github.com/spf13/pflag v1.0.9
49+
github.com/stretchr/testify v1.11.1
3250
github.com/vmihailenco/msgpack/v4 v4.3.12
3351
github.com/xrstf/mockoidc v0.0.0-20251106154715-f2594670cb08
34-
golang.org/x/oauth2 v0.29.0
35-
google.golang.org/grpc v1.70.0
52+
golang.org/x/oauth2 v0.30.0
53+
google.golang.org/grpc v1.72.1
3654
gopkg.in/yaml.v3 v3.0.1
37-
k8s.io/api v0.33.3
38-
k8s.io/apiextensions-apiserver v0.33.3
39-
k8s.io/apimachinery v0.33.3
40-
k8s.io/apiserver v0.33.3
41-
k8s.io/cli-runtime v0.32.0
42-
k8s.io/client-go v0.33.3
43-
k8s.io/code-generator v0.33.3
44-
k8s.io/component-base v0.33.3
55+
k8s.io/api v0.34.0
56+
k8s.io/apiextensions-apiserver v0.34.0
57+
k8s.io/apimachinery v0.34.0
58+
k8s.io/apiserver v0.34.0
59+
k8s.io/cli-runtime v0.34.0
60+
k8s.io/client-go v0.34.0
61+
k8s.io/code-generator v0.34.0
62+
k8s.io/component-base v0.34.0
4563
k8s.io/klog/v2 v2.130.1
4664
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
4765
sigs.k8s.io/controller-runtime v0.21.0
4866
sigs.k8s.io/controller-tools v0.16.1
4967
sigs.k8s.io/multicluster-runtime v0.21.0-alpha.9.0.20251002124257-36facc7fbe82
50-
sigs.k8s.io/yaml v1.4.0
68+
sigs.k8s.io/yaml v1.6.0
5169
)
5270

5371
require (
54-
cel.dev/expr v0.19.1 // indirect
55-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
72+
cel.dev/expr v0.24.0 // indirect
73+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
5674
github.com/NYTimes/gziphandler v1.1.1 // indirect
5775
github.com/PuerkitoBio/goquery v1.10.3 // indirect
5876
github.com/andybalholm/cascadia v1.3.3 // indirect
@@ -64,12 +82,11 @@ require (
6482
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6583
github.com/coreos/go-semver v0.3.1 // indirect
6684
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
67-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
68-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
85+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
6986
github.com/fatih/color v1.18.0 // indirect
7087
github.com/felixge/httpsnoop v1.0.4 // indirect
71-
github.com/fsnotify/fsnotify v1.7.0 // indirect
72-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
88+
github.com/fsnotify/fsnotify v1.9.0 // indirect
89+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
7390
github.com/go-errors/errors v1.4.2 // indirect
7491
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
7592
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
@@ -83,13 +100,12 @@ require (
83100
github.com/gogo/protobuf v1.3.2 // indirect
84101
github.com/golang/protobuf v1.5.4 // indirect
85102
github.com/google/btree v1.1.3 // indirect
86-
github.com/google/cel-go v0.23.2 // indirect
87-
github.com/google/gnostic-models v0.6.9 // indirect
88-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
103+
github.com/google/cel-go v0.26.0 // indirect
104+
github.com/google/gnostic-models v0.7.0 // indirect
89105
github.com/google/uuid v1.6.0 // indirect
90106
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
91107
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
92-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
108+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
93109
github.com/headzoo/ut v0.0.0-20181013193318-a13b5a7a02ca // indirect
94110
github.com/inconshreveable/mousetrap v1.1.0 // indirect
95111
github.com/josharian/intern v1.0.0 // indirect
@@ -101,9 +117,9 @@ require (
101117
github.com/mailru/easyjson v0.9.0 // indirect
102118
github.com/mattn/go-colorable v0.1.13 // indirect
103119
github.com/mattn/go-isatty v0.0.20 // indirect
104-
github.com/moby/term v0.5.0 // indirect
120+
github.com/moby/term v0.5.2 // indirect
105121
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
106-
github.com/modern-go/reflect2 v1.0.2 // indirect
122+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
107123
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
108124
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
109125
github.com/onsi/gomega v1.36.2 // indirect
@@ -119,46 +135,49 @@ require (
119135
github.com/vmihailenco/tagparser v0.1.1 // indirect
120136
github.com/x448/float16 v0.8.4 // indirect
121137
github.com/xlab/treeprint v1.2.0 // indirect
122-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
123-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
124-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
138+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
139+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
140+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
125141
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
126-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
142+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
127143
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
128-
go.opentelemetry.io/otel v1.33.0 // indirect
129-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
130-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
131-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
132-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
133-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
144+
go.opentelemetry.io/otel v1.35.0 // indirect
145+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
146+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
147+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
148+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
149+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
134150
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
135151
go.uber.org/multierr v1.11.0 // indirect
136152
go.uber.org/zap v1.27.0 // indirect
137-
golang.org/x/crypto v0.38.0 // indirect
153+
go.yaml.in/yaml/v2 v2.4.2 // indirect
154+
go.yaml.in/yaml/v3 v3.0.4 // indirect
155+
golang.org/x/crypto v0.41.0 // indirect
138156
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
139-
golang.org/x/mod v0.24.0 // indirect
140-
golang.org/x/net v0.40.0 // indirect
141-
golang.org/x/sync v0.14.0 // indirect
142-
golang.org/x/sys v0.33.0 // indirect
143-
golang.org/x/term v0.32.0 // indirect
144-
golang.org/x/text v0.25.0 // indirect
145-
golang.org/x/time v0.11.0 // indirect
146-
golang.org/x/tools v0.33.0 // indirect
157+
golang.org/x/mod v0.26.0 // indirect
158+
golang.org/x/net v0.42.0 // indirect
159+
golang.org/x/sync v0.16.0 // indirect
160+
golang.org/x/sys v0.35.0 // indirect
161+
golang.org/x/term v0.34.0 // indirect
162+
golang.org/x/text v0.28.0 // indirect
163+
golang.org/x/time v0.12.0 // indirect
164+
golang.org/x/tools v0.35.0 // indirect
165+
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
147166
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
148167
google.golang.org/appengine v1.6.7 // indirect
149168
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
150-
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
151-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
169+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
170+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
152171
google.golang.org/protobuf v1.36.5 // indirect
153172
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
154173
gopkg.in/inf.v0 v0.9.1 // indirect
155174
gopkg.in/yaml.v2 v2.4.0 // indirect
156-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
157-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
175+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
176+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
158177
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
159178
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
160-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
161-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
179+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
180+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
162181
sigs.k8s.io/randfill v1.0.0 // indirect
163182
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
164183
)

0 commit comments

Comments
 (0)