From 68e41e7c67df1c9c7ec28f6c70431c542ee043ef Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 23 May 2024 08:15:56 -0700 Subject: [PATCH] Merge pull request #124948 from SataQiu/clean-20240519 kube-controller-manager: remove the deprecated horizontal-pod-autoscaler-upscale-delay and horizontal-pod-autoscaler-downscale-delay flags Kubernetes-commit: ef39aa896a884fa4a57b5015d0eea3e75cf23c96 --- go.mod | 12 ++++++++++-- go.sum | 9 ++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 45c7bce..89ee673 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ module k8s.io/kube-controller-manager go 1.22.0 require ( - k8s.io/apimachinery v0.0.0-20240503202409-c9c3e94f52f0 + k8s.io/apimachinery v0.0.0-20240523043213-5c8637dbd9df k8s.io/cloud-provider v0.0.0-20240509012025-d2f5e75a5fd6 k8s.io/controller-manager v0.0.0-20240509011822-8c3ac9795d54 ) @@ -15,7 +15,6 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kr/text v0.2.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect golang.org/x/net v0.23.0 // indirect @@ -23,9 +22,18 @@ require ( gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + k8s.io/api v0.0.0-20240516203440-664bdd58a30d // indirect k8s.io/component-base v0.0.0-20240509004100-482591e4108c // indirect k8s.io/klog/v2 v2.120.1 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) + +replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20240523173041-5e4ee5bf4eed + +replace k8s.io/client-go => k8s.io/client-go v0.0.0-20240521090535-c7396197f39e + +replace k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20240511203730-30c6ab0cd73e + +replace k8s.io/kms => k8s.io/kms v0.0.0-20240515043828-5c7c183dd3e9 diff --git a/go.sum b/go.sum index 3673702..9b2c715 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -79,10 +78,10 @@ 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= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.0.0-20240508202814-7ccc2456a96f h1:JD5C6Ov1+pP7Ze8s7O/+0YfhlAH2NrkuSLWCn0F1KRU= -k8s.io/api v0.0.0-20240508202814-7ccc2456a96f/go.mod h1:63wOlHLR6A1SAeEfLi6u/gVTKmQklvs6IL52WjMSKn0= -k8s.io/apimachinery v0.0.0-20240503202409-c9c3e94f52f0 h1:7WYV6yFZ33GBiOXTMsfUjlaZvdWfda0JRXrn/xxekAY= -k8s.io/apimachinery v0.0.0-20240503202409-c9c3e94f52f0/go.mod h1:+hpAhBheGa7Ub4X6JfKqjEeACgGYZqZv+ILGzigzVGU= +k8s.io/api v0.0.0-20240516203440-664bdd58a30d h1:0j0GmUGa2xvgJJiTzGQhNRKa2ByzpqDlBhggVRVmrfY= +k8s.io/api v0.0.0-20240516203440-664bdd58a30d/go.mod h1:GIl44YEE/I5fp0xgOEQrSjkLfe5trkF4SgIeRHHviOk= +k8s.io/apimachinery v0.0.0-20240523043213-5c8637dbd9df h1:8gUIgtpvsB04mpZKdHNcI0AVWYExv0LJNV1Rfrpp4Qs= +k8s.io/apimachinery v0.0.0-20240523043213-5c8637dbd9df/go.mod h1:+hpAhBheGa7Ub4X6JfKqjEeACgGYZqZv+ILGzigzVGU= k8s.io/cloud-provider v0.0.0-20240509012025-d2f5e75a5fd6 h1:yt2h9lm73+AC+XvuLvCwhleCm7VA1dQrq68b+OF470g= k8s.io/cloud-provider v0.0.0-20240509012025-d2f5e75a5fd6/go.mod h1:Sw5fyjsfsCF40mXg9lbOAEHvj0KbKMoDEeG4m9Jly8o= k8s.io/component-base v0.0.0-20240509004100-482591e4108c h1:dsvBpyLyEc10p5ARPS+9ZZgYIu8W89k2T9oNWvgxEmQ=