Skip to content

Commit 887679f

Browse files
Merge remote-tracking branch 'origin/master' into release-1.32
Kubernetes-commit: 22b14e54a4caac0a20428e51ba874b1af8b0e4cb
1 parent bd027a4 commit 887679f

File tree

2 files changed

+21
-164
lines changed

2 files changed

+21
-164
lines changed

Diff for: go.mod

+7-17
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ require (
2727
google.golang.org/grpc v1.65.0
2828
google.golang.org/protobuf v1.35.1
2929
gopkg.in/evanphx/json-patch.v4 v4.12.0
30-
k8s.io/api v0.0.0
31-
k8s.io/apimachinery v0.0.0
32-
k8s.io/apiserver v0.0.0
33-
k8s.io/client-go v0.0.0
34-
k8s.io/code-generator v0.0.0
35-
k8s.io/component-base v0.0.0
30+
k8s.io/api v0.0.0-20241206182328-b0543a351f7c
31+
k8s.io/apimachinery v0.0.0-20241206181855-59e9003f02d6
32+
k8s.io/apiserver v0.0.0-20241206190231-34b7cc90dd5f
33+
k8s.io/client-go v0.0.0-20241206183707-4765adee376d
34+
k8s.io/code-generator v0.0.0-20241206184641-1bfda81f6630
35+
k8s.io/component-base v0.0.0-20241206184937-e168b31aab46
3636
k8s.io/klog/v2 v2.130.1
3737
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
3838
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
@@ -124,16 +124,6 @@ require (
124124
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
125125
gopkg.in/yaml.v3 v3.0.1 // indirect
126126
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
127-
k8s.io/kms v0.0.0 // indirect
127+
k8s.io/kms v0.0.0-20241206185346-613a31f60a08 // indirect
128128
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
129129
)
130-
131-
replace (
132-
k8s.io/api => ../api
133-
k8s.io/apimachinery => ../apimachinery
134-
k8s.io/apiserver => ../apiserver
135-
k8s.io/client-go => ../client-go
136-
k8s.io/code-generator => ../code-generator
137-
k8s.io/component-base => ../component-base
138-
k8s.io/kms => ../kms
139-
)

0 commit comments

Comments
 (0)