From a57d9c36b9a8a54f3c8f5fa0a2642002e590364a Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 1 Mar 2024 05:35:47 -0800 Subject: [PATCH] Merge pull request #123613 from aojea/revert_ccm Revert "[cloud-provider] require providerID to initialize node" Kubernetes-commit: d51e2da869350b2b20a33d060e17bd1d2165e02d --- go.mod | 20 ++++++++++---------- go.sum | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 493dbaae..9c13396c 100644 --- a/go.mod +++ b/go.mod @@ -9,13 +9,13 @@ require ( github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 - k8s.io/api v0.0.0-20240228104440-d6ea7e8f9bfc - k8s.io/apimachinery v0.0.0-20240221202133-0f2e9357997f - k8s.io/apiserver v0.0.0-20240229122720-3d757e5f422a - k8s.io/client-go v0.0.0-20240228230157-d99a76c51e14 + k8s.io/api v0.0.0-20240301075851-e88057d7f696 + k8s.io/apimachinery v0.0.0-20240229214048-6362b69e393e + k8s.io/apiserver v0.0.0-20240301082212-57928aa72ccb + k8s.io/client-go v0.0.0-20240229235935-1047f6396b27 k8s.io/component-base v0.0.0-20240227002902-6c2a49d37aa4 k8s.io/component-helpers v0.0.0-20240221203355-866cab6f8733 - k8s.io/controller-manager v0.0.0-20240229125230-05eba06abdf4 + k8s.io/controller-manager v0.0.0-20240301183252-794eaf02044f k8s.io/klog/v2 v2.120.1 k8s.io/utils v0.0.0-20230726121419-3b25d923346b ) @@ -110,12 +110,12 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20240228104440-d6ea7e8f9bfc - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240221202133-0f2e9357997f - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20240229122720-3d757e5f422a - k8s.io/client-go => k8s.io/client-go v0.0.0-20240228230157-d99a76c51e14 + k8s.io/api => k8s.io/api v0.0.0-20240301075851-e88057d7f696 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240229214048-6362b69e393e + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20240301082212-57928aa72ccb + k8s.io/client-go => k8s.io/client-go v0.0.0-20240229235935-1047f6396b27 k8s.io/component-base => k8s.io/component-base v0.0.0-20240227002902-6c2a49d37aa4 k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20240221203355-866cab6f8733 - k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20240229125230-05eba06abdf4 + k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20240301183252-794eaf02044f k8s.io/kms => k8s.io/kms v0.0.0-20240221203502-15393f39a6fb ) diff --git a/go.sum b/go.sum index fdc7c20e..a887ab3a 100644 --- a/go.sum +++ b/go.sum @@ -294,20 +294,20 @@ 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/api v0.0.0-20240228104440-d6ea7e8f9bfc h1:7IBpQCcIsPKGiK8R2xVKsFYdcqvt5UIiA4ARPHdlUoQ= -k8s.io/api v0.0.0-20240228104440-d6ea7e8f9bfc/go.mod h1:kCYq4mrNBxRaHCZeTveL6//1FveIDm3wxJZeFNKF6b8= -k8s.io/apimachinery v0.0.0-20240221202133-0f2e9357997f h1:IvhurYeUUiUsNbDhVJHvOwhgfpUoobqtGQGat2VxfcQ= -k8s.io/apimachinery v0.0.0-20240221202133-0f2e9357997f/go.mod h1:/862Kkwje5hhHGJWPKiaHuov2c6mw6uCXWikV9kOIP4= -k8s.io/apiserver v0.0.0-20240229122720-3d757e5f422a h1:40AJ12gvvbNlFB2QQtJ98lbEkWpFru/jKPwWKRot72g= -k8s.io/apiserver v0.0.0-20240229122720-3d757e5f422a/go.mod h1:qKJTjU6234ehYV+y9VetdPVPplO4dlbpD55dTD0cFBA= -k8s.io/client-go v0.0.0-20240228230157-d99a76c51e14 h1:Pd0riBkFLU/4O4e9w5BP5mWjZpAezQP3nes1p5Fq+do= -k8s.io/client-go v0.0.0-20240228230157-d99a76c51e14/go.mod h1:POy8aYfSP1JEg4zV2/EFn50npEHhxwCnakxGKOLgBds= +k8s.io/api v0.0.0-20240301075851-e88057d7f696 h1:dNUDjjm6p1nZ2Wqja9FV7WdHjeHtkqo6ee3XC81Ybew= +k8s.io/api v0.0.0-20240301075851-e88057d7f696/go.mod h1:oCSigER/C5hq1h0MXoiusu0ThLyIqexwPUZF8b3l8Sk= +k8s.io/apimachinery v0.0.0-20240229214048-6362b69e393e h1:2XgAKNuD1VSLa8SmR/BCQR6MX6xHn1SyB29fBYaBpcI= +k8s.io/apimachinery v0.0.0-20240229214048-6362b69e393e/go.mod h1:/862Kkwje5hhHGJWPKiaHuov2c6mw6uCXWikV9kOIP4= +k8s.io/apiserver v0.0.0-20240301082212-57928aa72ccb h1:CkAxpED+NhFPq9umfgV2HUCNPKI5tqIwRbL5eMHqsh4= +k8s.io/apiserver v0.0.0-20240301082212-57928aa72ccb/go.mod h1:ZRERVa2KtUgO2fjV01BaueXmw3xhccZlX2bAyD8goq0= +k8s.io/client-go v0.0.0-20240229235935-1047f6396b27 h1:OGxYArAVkK4G3VhF7CNChpY+jGiqXeBahjoXEN0+3/s= +k8s.io/client-go v0.0.0-20240229235935-1047f6396b27/go.mod h1:IKlRh4W5p0W8/mnVZNasbhJXwbaPUnhSKnJ3uj8oAGI= k8s.io/component-base v0.0.0-20240227002902-6c2a49d37aa4 h1:QaNZj1n3+yyPNYz682bWlcjdJjAuSqSsvO5fDGQafxY= k8s.io/component-base v0.0.0-20240227002902-6c2a49d37aa4/go.mod h1:Bf74PikueyXc4hduq9Fk6HNHav/OCym3S0shcPoh/mA= k8s.io/component-helpers v0.0.0-20240221203355-866cab6f8733 h1:yjFDI+d1a3OGh7dOUZqP6vnUst/MFweCakqhPH0hILc= k8s.io/component-helpers v0.0.0-20240221203355-866cab6f8733/go.mod h1:6EIc878uhjskixew9YOcZJFNzokUEKe0JfdWw4Gi6CM= -k8s.io/controller-manager v0.0.0-20240229125230-05eba06abdf4 h1:wzPr8G2NIYN+UeTtE0m+nnxeyXoaWzZ1GJJzo3k3r7I= -k8s.io/controller-manager v0.0.0-20240229125230-05eba06abdf4/go.mod h1:RxcOsgmhlIl8AZ3r78oXCEVH9xBl3YzqmV7dXsC4FzY= +k8s.io/controller-manager v0.0.0-20240301183252-794eaf02044f h1:zwM9hzF4rMAeq61jFO8WTtaV3Kcuug2s7vLs7kwLsBc= +k8s.io/controller-manager v0.0.0-20240301183252-794eaf02044f/go.mod h1:rf3igwtXM+gTY/5JaU8bQFOF4UGM7KvGMD5dDDTXkZw= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kms v0.0.0-20240221203502-15393f39a6fb h1:i1haEXXv7oYb1tD43RCS7Yww0JAM63QIyMw9HZeRmDw=