Skip to content

Commit cb47ad4

Browse files
Merge remote-tracking branch 'origin/master' into release-1.30
Kubernetes-commit: 255e7919bcb340043b0d235f883fe070017ce18f
1 parent 6ce7f38 commit cb47ad4

File tree

2 files changed

+21
-159
lines changed

2 files changed

+21
-159
lines changed

go.mod

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ require (
2424
google.golang.org/grpc v1.58.3
2525
google.golang.org/protobuf v1.33.0
2626
gopkg.in/yaml.v2 v2.4.0
27-
k8s.io/api v0.0.0
28-
k8s.io/apimachinery v0.0.0
29-
k8s.io/apiserver v0.0.0
30-
k8s.io/client-go v0.0.0
31-
k8s.io/code-generator v0.0.0
32-
k8s.io/component-base v0.0.0
27+
k8s.io/api v0.0.0-20240405200954-d014286182f6
28+
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16
29+
k8s.io/apiserver v0.0.0-20240405202321-d97582edf43f
30+
k8s.io/client-go v0.0.0-20240405201205-2df4de16d44f
31+
k8s.io/code-generator v0.0.0-20240405201738-e1372fd02c43
32+
k8s.io/component-base v0.0.0-20240405201845-0ac84ef15102
3333
k8s.io/klog/v2 v2.120.1
3434
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
3535
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
@@ -122,17 +122,6 @@ require (
122122
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
123123
gopkg.in/yaml.v3 v3.0.1 // indirect
124124
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
125-
k8s.io/kms v0.0.0 // indirect
125+
k8s.io/kms v0.0.0-20240405202036-6673ad0cfb8f // indirect
126126
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
127127
)
128-
129-
replace (
130-
k8s.io/api => ../api
131-
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
132-
k8s.io/apimachinery => ../apimachinery
133-
k8s.io/apiserver => ../apiserver
134-
k8s.io/client-go => ../client-go
135-
k8s.io/code-generator => ../code-generator
136-
k8s.io/component-base => ../component-base
137-
k8s.io/kms => ../kms
138-
)

0 commit comments

Comments
 (0)