From feff439bafec50c38df948a83dcc2afd5f4d1d18 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Tue, 15 Nov 2022 10:16:41 -0800 Subject: [PATCH] Merge pull request #113919 from liggitt/go1.18-1.24 Manual cherry pick of #109440: update go.mod files to go 1.18 Kubernetes-commit: 3bd00ba2ef3955118d7ae72eb154be61bb4f6955 --- go.mod | 25 ++++++++++++------------- go.sum | 9 +++++++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 6cc4f7b..f2e1b01 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager go 1.18 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-20221115214803-6b68b3797fe7 + k8s.io/cloud-provider v0.0.0-20221115224247-5027a068d8a2 + k8s.io/controller-manager v0.0.0-20221115224045-168d1401444b ) require ( @@ -22,7 +22,7 @@ require ( golang.org/x/text v0.3.7 // 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-20221115220504-f5a6366a2adf // indirect k8s.io/klog/v2 v2.60.1 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect @@ -30,13 +30,12 @@ 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/kube-controller-manager => ../kube-controller-manager + k8s.io/api => k8s.io/api v0.0.0-20221115215144-a01d6650879f + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221115214803-6b68b3797fe7 + k8s.io/apiserver => k8s.io/apiserver v0.0.0-20221115221448-2156e392aedd + k8s.io/client-go => k8s.io/client-go v0.0.0-20221115215723-128430567c40 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20221115224247-5027a068d8a2 + k8s.io/component-base => k8s.io/component-base v0.0.0-20221115220504-f5a6366a2adf + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20221115220641-f255fd0f01f9 + k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20221115224045-168d1401444b ) diff --git a/go.sum b/go.sum index 1a029e8..ffa61de 100644 --- a/go.sum +++ b/go.sum @@ -71,6 +71,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-20221115215144-a01d6650879f h1:6GDXO5AaWmA5JGKyTAzEkJMgu0vV+d1yExs2FjoyDzk= +k8s.io/apimachinery v0.0.0-20221115214803-6b68b3797fe7 h1:SZ4S7i9TGLJlG88gpySRrfhXTyRyZGEiyAuwctixOQk= +k8s.io/apimachinery v0.0.0-20221115214803-6b68b3797fe7/go.mod h1:d6ct2HoIiXpJiQl5MY0qukHV38O9hWbTW1huL0StVl4= +k8s.io/cloud-provider v0.0.0-20221115224247-5027a068d8a2 h1:G1dWeCJEtgGGnjUW47eX6Z9DFxmilPpuwT5znhdDIfc= +k8s.io/cloud-provider v0.0.0-20221115224247-5027a068d8a2/go.mod h1:ExnxI4gCYv6cMsdq09vCrRXCO6+eLYVqbKqXkFUHu8w= +k8s.io/component-base v0.0.0-20221115220504-f5a6366a2adf h1:dJx0A1eV9sNPAF6LBf8w+cMBr+mUUaCNYF9qwQHDKJg= +k8s.io/component-base v0.0.0-20221115220504-f5a6366a2adf/go.mod h1:djmPJNBRAEIe7fe9td8vWj5QN8m1EFH5innoIQ3w9Vs= +k8s.io/controller-manager v0.0.0-20221115224045-168d1401444b h1:5POrzIxDR5uMrCW+SK5DYbzhAxiXpV1mLLZ+p7mQv1g= +k8s.io/controller-manager v0.0.0-20221115224045-168d1401444b/go.mod h1:dZRREcTn2TA9OmdNyreo+Z54tY/WWEHIbjc5SOn0FQc= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=