Skip to content

Commit 559da62

Browse files
Merge remote-tracking branch 'origin/master' into release-1.27
Kubernetes-commit: 0d6e44998fe1c0a21d0aba1327f55d60ae8a7c2d
1 parent 012beed commit 559da62

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-20230327181953-5b93db5944f3
28+
k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
2929
k8s.io/klog/v2 v2.90.1
3030
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a
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-20230327181953-5b93db5944f3
63+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
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-20230327181953-5b93db5944f3 h1:XvTPeYtRRACrKZGRDkpHMRXq/xT9/cWZPv+Sx7t4HHU=
481+
k8s.io/api v0.0.0-20230327181953-5b93db5944f3/go.mod h1:RAYThv5ELmDNk2Kt+PWiwWtAI1TZyap1JK1QStRzwyw=
482+
k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 h1:n1qDRCTPAXwyXYg7eSpWDO9FdW79lwAQ9dAr1vETpn4=
483+
k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
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-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=

0 commit comments

Comments
 (0)