Skip to content

Commit 015caa2

Browse files
Merge pull request #117708 from Jefftree/automated-cherry-pick-of-#117705-upstream-release-1.27
Automated cherry pick of #117705: Update kube-openapi to fix race Kubernetes-commit: 7d93cc600f4c6dbd5c0b9e37ae7f351cfc59fde7
1 parent fb5347d commit 015caa2

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ require (
2424
golang.org/x/term v0.6.0
2525
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
2626
google.golang.org/protobuf v1.28.1
27-
k8s.io/api v0.0.0
28-
k8s.io/apimachinery v0.0.0
27+
k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7
28+
k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a
2929
k8s.io/klog/v2 v2.90.1
3030
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
3131
k8s.io/utils v0.0.0-20230209194617-a36077c30491
@@ -59,7 +59,6 @@ require (
5959
)
6060

6161
replace (
62-
k8s.io/api => ../api
63-
k8s.io/apimachinery => ../apimachinery
64-
k8s.io/client-go => ../client-go
62+
k8s.io/api => k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7
63+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a
6564
)

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
477477
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
478478
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
479479
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
480+
k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7 h1:QrPMgZCXYbzEq6h5azDuaqNoWs7rI3pKvW8pX/CBPqo=
481+
k8s.io/api v0.0.0-20230424183503-a94d26e5d6b7/go.mod h1:RAYThv5ELmDNk2Kt+PWiwWtAI1TZyap1JK1QStRzwyw=
482+
k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a h1:FId7MLgk0l0XnnlbixZAzcmQiWYsHGkIrxLlazD7RZA=
483+
k8s.io/apimachinery v0.0.0-20230502173644-b1123d27117a/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
480484
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
481485
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
482486
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=

0 commit comments

Comments
 (0)