Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into release-1.28
Browse files Browse the repository at this point in the history
Kubernetes-commit: 6d5bbea0ba66f1cf5a84834eeaeeb9579798b790
  • Loading branch information
k8s-publishing-bot committed Aug 7, 2023
1 parent c2ee70c commit 8d0fca9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 162 deletions.
13 changes: 6 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ require (
go.opentelemetry.io/otel/trace v1.10.0
go.uber.org/zap v1.19.0
golang.org/x/sys v0.10.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/apimachinery v0.0.0-20230807201834-4b14f804a0ba
k8s.io/client-go v0.0.0-20230807210255-dcfe307184d9
k8s.io/klog/v2 v2.100.1
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
Expand Down Expand Up @@ -79,15 +79,14 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.0.0 // indirect
k8s.io/api v0.0.0-20230807203228-9ab79eae448c // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/api => k8s.io/api v0.0.0-20230807203228-9ab79eae448c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230807201834-4b14f804a0ba
k8s.io/client-go => k8s.io/client-go v0.0.0-20230807210255-dcfe307184d9
)
Loading

0 comments on commit 8d0fca9

Please sign in to comment.