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 f1b3eff commit 9bd9c25
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 162 deletions.
28 changes: 8 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ require (
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
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/component-base v0.0.0
k8s.io/component-helpers v0.0.0
k8s.io/controller-manager 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/component-base v0.0.0-20240405201845-0ac84ef15102
k8s.io/component-helpers v0.0.0-20240405201943-7c78723d377a
k8s.io/controller-manager v0.0.0-20240405203900-03b86edb0551
k8s.io/klog/v2 v2.120.1
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
)
Expand Down Expand Up @@ -101,22 +101,10 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/kms v0.0.0 // indirect
k8s.io/kms v0.0.0-20240405202036-6673ad0cfb8f // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/controller-manager => ../controller-manager
k8s.io/kms => ../kms
)
Loading

0 comments on commit 9bd9c25

Please sign in to comment.