Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into release-1.32
Browse files Browse the repository at this point in the history
Kubernetes-commit: 22b14e54a4caac0a20428e51ba874b1af8b0e4cb
  • Loading branch information
k8s-publishing-bot committed Dec 6, 2024
1 parent bd027a4 commit 887679f
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 164 deletions.
24 changes: 7 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ require (
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.35.1
gopkg.in/evanphx/json-patch.v4 v4.12.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-20241206182328-b0543a351f7c
k8s.io/apimachinery v0.0.0-20241206181855-59e9003f02d6
k8s.io/apiserver v0.0.0-20241206190231-34b7cc90dd5f
k8s.io/client-go v0.0.0-20241206183707-4765adee376d
k8s.io/code-generator v0.0.0-20241206184641-1bfda81f6630
k8s.io/component-base v0.0.0-20241206184937-e168b31aab46
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
Expand Down Expand Up @@ -124,16 +124,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-20240911193312-2b36238f13e9 // indirect
k8s.io/kms v0.0.0 // indirect
k8s.io/kms v0.0.0-20241206185346-613a31f60a08 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
)

replace (
k8s.io/api => ../api
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 887679f

Please sign in to comment.