From 5b93db5944f36f621a9f64b60acced94fce32903 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 27 Mar 2023 16:26:19 +0000 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into release-1.27 Kubernetes-commit: 0d6e44998fe1c0a21d0aba1327f55d60ae8a7c2d --- go.mod | 7 ++----- go.sum | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 6d67fa8059..d2942c18a2 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ go 1.20 require ( github.com/gogo/protobuf v1.3.2 github.com/stretchr/testify v1.8.1 - k8s.io/apimachinery v0.0.0 + k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 ) require ( @@ -37,7 +37,4 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery -) +replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230315054728-8d1258da8f38 diff --git a/go.sum b/go.sum index 5fcc6e8fe9..3c692e0058 100644 --- a/go.sum +++ b/go.sum @@ -91,6 +91,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +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/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=