Merge remote-tracking branch 'origin/master' into release-1.27

Kubernetes-commit: 0d6e44998fe1c0a21d0aba1327f55d60ae8a7c2d

go.mod

@@ -24,8 +24,8 @@ require (
  golang.org/x/term v0.6.0
  golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
  google.golang.org/protobuf v1.28.1
- k8s.io/api v0.0.0
- k8s.io/apimachinery v0.0.0
+ k8s.io/api v0.0.0-20230327181953-5b93db5944f3
+ k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
  k8s.io/klog/v2 v2.90.1
  k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a
  k8s.io/utils v0.0.0-20230209194617-a36077c30491
@@ -59,7 +59,6 @@ require (
 )
 
 replace (
- k8s.io/api => ../api
- k8s.io/apimachinery => ../apimachinery
- k8s.io/client-go => ../client-go
+ k8s.io/api => k8s.io/api v0.0.0-20230327181953-5b93db5944f3
+ k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38
 )

go.sum

@@ -477,6 +477,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+k8s.io/api v0.0.0-20230327181953-5b93db5944f3 h1:XvTPeYtRRACrKZGRDkpHMRXq/xT9/cWZPv+Sx7t4HHU=
+k8s.io/api v0.0.0-20230327181953-5b93db5944f3/go.mod h1:RAYThv5ELmDNk2Kt+PWiwWtAI1TZyap1JK1QStRzwyw=
+k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 h1:n1qDRCTPAXwyXYg7eSpWDO9FdW79lwAQ9dAr1vETpn4=
+k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
 k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
 k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=