Skip to content

Commit

Permalink
Merge pull request #119030 from aojea/automated-cherry-pick-of-#11625…
Browse files Browse the repository at this point in the history
…1-upstream-release-1.26

Automated cherry pick of #116251: Fix deadlock in ready test

Kubernetes-commit: 19b40ff9bf4af5420309808bdb12a0b1ae4fdadb
  • Loading branch information
k8s-publishing-bot committed Jul 6, 2023
1 parent 01571a2 commit e4f93e2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20230612172015-e5ccf2eb3112
k8s.io/apimachinery v0.0.0-20230612171130-c23a82e9e261
k8s.io/client-go v0.0.0-20230612174153-cb4594adb388
k8s.io/client-go v0.0.0-20230705164058-cea5ee961b2f
k8s.io/component-base v0.0.0-20230612180025-05b26fd95bb7
k8s.io/klog/v2 v2.80.1
k8s.io/kms v0.0.0-20230612180632-cff6428bab5b
Expand Down Expand Up @@ -124,7 +124,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20230612172015-e5ccf2eb3112
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230612171130-c23a82e9e261
k8s.io/client-go => k8s.io/client-go v0.0.0-20230612174153-cb4594adb388
k8s.io/client-go => k8s.io/client-go v0.0.0-20230705164058-cea5ee961b2f
k8s.io/component-base => k8s.io/component-base v0.0.0-20230612180025-05b26fd95bb7
k8s.io/kms => k8s.io/kms v0.0.0-20230612180632-cff6428bab5b
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -991,8 +991,8 @@ k8s.io/api v0.0.0-20230612172015-e5ccf2eb3112 h1:LYwAu2/HRSHgBWkBA3RMVM2dIbIAswC
k8s.io/api v0.0.0-20230612172015-e5ccf2eb3112/go.mod h1:Q8EGFh0r6aLpTL7AhOHjtyGHqNgb1S4Tly2XwYg8XT0=
k8s.io/apimachinery v0.0.0-20230612171130-c23a82e9e261 h1:e1ALI+iTI9xlG8DENWPhx4uZhrL5O5fU507otSjo9nU=
k8s.io/apimachinery v0.0.0-20230612171130-c23a82e9e261/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
k8s.io/client-go v0.0.0-20230612174153-cb4594adb388 h1:sRsojcbRTyAEMZ4Tabh9SLE5nO16DMHalxfgnNf0dFk=
k8s.io/client-go v0.0.0-20230612174153-cb4594adb388/go.mod h1:gaDBgnC0++iZJLEaNpknqeRt/pfeyGUrisoF+lR7YHs=
k8s.io/client-go v0.0.0-20230705164058-cea5ee961b2f h1:NtvxPKGiMmxCLxMBcB2lipIEuRq4TjI6rejpS0d6C3E=
k8s.io/client-go v0.0.0-20230705164058-cea5ee961b2f/go.mod h1:gaDBgnC0++iZJLEaNpknqeRt/pfeyGUrisoF+lR7YHs=
k8s.io/component-base v0.0.0-20230612180025-05b26fd95bb7 h1:gZmkr019SCenIN2lXfb06fuLN7lQTzayNU6/5uXJTho=
k8s.io/component-base v0.0.0-20230612180025-05b26fd95bb7/go.mod h1:IRHE6mCWqRgwL4fGUy/G327NhEdnyskNGvtw0fO6An0=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
Expand Down

0 comments on commit e4f93e2

Please sign in to comment.