Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into release-1.30
Browse files Browse the repository at this point in the history
Kubernetes-commit: 255e7919bcb340043b0d235f883fe070017ce18f
  • Loading branch information
k8s-publishing-bot committed Apr 5, 2024
1 parent 6ce7f38 commit cb47ad4
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 159 deletions.
25 changes: 7 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ require (
google.golang.org/grpc v1.58.3
google.golang.org/protobuf v1.33.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/apiserver v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.0.0-20240405200954-d014286182f6
k8s.io/apimachinery v0.0.0-20240405200823-37988e577e16
k8s.io/apiserver v0.0.0-20240405202321-d97582edf43f
k8s.io/client-go v0.0.0-20240405201205-2df4de16d44f
k8s.io/code-generator v0.0.0-20240405201738-e1372fd02c43
k8s.io/component-base v0.0.0-20240405201845-0ac84ef15102
k8s.io/klog/v2 v2.120.1
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
Expand Down Expand Up @@ -122,17 +122,6 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/kms v0.0.0 // indirect
k8s.io/kms v0.0.0-20240405202036-6673ad0cfb8f // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
)

replace (
k8s.io/api => ../api
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/kms => ../kms
)
Loading

0 comments on commit cb47ad4

Please sign in to comment.