From ef11762e7c6d3753ca5d8077e51f4492594b5821 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 12 Jan 2023 07:10:54 -0800 Subject: [PATCH] Merge pull request #114766 from MadhavJivrajani/prepare-for-go1.20 [Prepare for go1.20] *: Bump versions and fix tests Kubernetes-commit: 4802d7bb62c2623be8e4f940f6b5c1fcddd6c744 --- go.mod | 27 +++++++++++++-------------- go.sum | 9 +++++++++ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index c350b27..a741d92 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager go 1.19 require ( - k8s.io/apimachinery v0.0.0 - k8s.io/cloud-provider v0.0.0 - k8s.io/controller-manager v0.0.0 + k8s.io/apimachinery v0.0.0-20230112182327-235f5123de4a + k8s.io/cloud-provider v0.0.0-20230112213511-ba2fecb28eb0 + k8s.io/controller-manager v0.0.0-20230112212622-b6f093a9344d ) require ( @@ -23,7 +23,7 @@ require ( golang.org/x/text v0.5.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/component-base v0.0.0 // indirect + k8s.io/component-base v0.0.0-20230112192322-5d7d9c1215cf // indirect k8s.io/klog/v2 v2.80.1 // indirect k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect @@ -31,14 +31,13 @@ require ( ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/apiserver => ../apiserver - k8s.io/client-go => ../client-go - k8s.io/cloud-provider => ../cloud-provider - k8s.io/component-base => ../component-base - k8s.io/component-helpers => ../component-helpers - k8s.io/controller-manager => ../controller-manager - k8s.io/kms => ../kms - k8s.io/kube-controller-manager => ../kube-controller-manager + k8s.io/api => k8s.io/api v0.0.0-20230112183318-59fcd23597fd + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230112182327-235f5123de4a + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230112193528-c1d39b78f95c + k8s.io/client-go => k8s.io/client-go v0.0.0-20230112184258-895a515b59eb + k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230112213511-ba2fecb28eb0 + k8s.io/component-base => k8s.io/component-base v0.0.0-20230112192322-5d7d9c1215cf + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230112192807-2c4994331fb8 + k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230112212622-b6f093a9344d + k8s.io/kms => k8s.io/kms v0.0.0-20230107081413-fd373b9a5aa5 ) diff --git a/go.sum b/go.sum index 657218a..3fcb9b9 100644 --- a/go.sum +++ b/go.sum @@ -70,6 +70,15 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +k8s.io/api v0.0.0-20230112183318-59fcd23597fd h1:Y/vljv797SrqMUZ4KwQaIDcz+lecu074ACcke2d8D9s= +k8s.io/apimachinery v0.0.0-20230112182327-235f5123de4a h1:ztM2zo2xo0w+WBKGJ/V/TnavQfbZnADVA5s4p3LGDpo= +k8s.io/apimachinery v0.0.0-20230112182327-235f5123de4a/go.mod h1:Kq932aOItR+rI/aiAVDXxxdRFNf0eLnI0gZmXJ6hl3o= +k8s.io/cloud-provider v0.0.0-20230112213511-ba2fecb28eb0 h1:gmO54vC7qFHcNESI4+pPEUC15neAgJfk4nqWTLextsg= +k8s.io/cloud-provider v0.0.0-20230112213511-ba2fecb28eb0/go.mod h1:2ovy4MD6cFpiqWaCjG2lIND6JEUno1D/s3v/5y13AMo= +k8s.io/component-base v0.0.0-20230112192322-5d7d9c1215cf h1:DMziyEfJ1RCLVP1MM9slf37W+sQ+FgW7WONDG6t0z3A= +k8s.io/component-base v0.0.0-20230112192322-5d7d9c1215cf/go.mod h1:f8fZigwyssj2yf6RZ+qJozRpYKqU83FlpG65XZMgOcc= +k8s.io/controller-manager v0.0.0-20230112212622-b6f093a9344d h1:RHcOuWtNRrK2PFjC6uUeDkNL86QjlqSOXVFjJ45CWng= +k8s.io/controller-manager v0.0.0-20230112212622-b6f093a9344d/go.mod h1:yMDB/y4jFPrLc0TH2L/Yd2zltNLsgMxNoEyd1r0H8Ps= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=