kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #90368 from serathius/remove-legacy-metrics 

Remove legacy metrics client from podautoscaler

Kubernetes-commit: e6a8bc9fbe9ce428f6b97630d931ba2b6aa70a91
This commit is contained in:
Kubernetes Publisher 2021-06-05 08:44:38 -07:00
parent a7375dac34 b433ee0148
commit 2f802ddba9
5 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -932,7 +932,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "597d8a9937fd"
"Rev": "9f22d1265651"
},
{
"ImportPath": "k8s.io/apimachinery",
@ -944,7 +944,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "71f81dc71522"
"Rev": "ded678f91ed5"
},
{
"ImportPath": "k8s.io/cloud-provider",

4
config/v1alpha1/types.go
View File

@ -328,10 +328,6 @@ type HPAControllerConfiguration struct {
// HorizontalPodAutoscalerTolerance is the tolerance for when
// resource usage suggests upscaling/downscaling
HorizontalPodAutoscalerTolerance float64
// HorizontalPodAutoscalerUseRESTClients causes the HPA controller to use REST clients
// through the kube-aggregator when enabled, instead of using the legacy metrics client
// through the API server proxy.
HorizontalPodAutoscalerUseRESTClients *bool
// HorizontalPodAutoscalerCPUInitializationPeriod is the period after pod start when CPU samples
// might be skipped.
HorizontalPodAutoscalerCPUInitializationPeriod metav1.Duration

7
config/v1alpha1/zz_generated.deepcopy.go
View File

@ -243,11 +243,6 @@ func (in *HPAControllerConfiguration) DeepCopyInto(out *HPAControllerConfigurati
out.HorizontalPodAutoscalerUpscaleForbiddenWindow = in.HorizontalPodAutoscalerUpscaleForbiddenWindow
out.HorizontalPodAutoscalerDownscaleStabilizationWindow = in.HorizontalPodAutoscalerDownscaleStabilizationWindow
out.HorizontalPodAutoscalerDownscaleForbiddenWindow = in.HorizontalPodAutoscalerDownscaleForbiddenWindow
if in.HorizontalPodAutoscalerUseRESTClients != nil {
in, out := &in.HorizontalPodAutoscalerUseRESTClients, &out.HorizontalPodAutoscalerUseRESTClients
*out = new(bool)
**out = **in
}
out.HorizontalPodAutoscalerCPUInitializationPeriod = in.HorizontalPodAutoscalerCPUInitializationPeriod
out.HorizontalPodAutoscalerInitialReadinessDelay = in.HorizontalPodAutoscalerInitialReadinessDelay
return
@ -295,7 +290,7 @@ func (in *KubeControllerManagerConfiguration) DeepCopyInto(out *KubeControllerMa
out.EndpointSliceController = in.EndpointSliceController
out.EndpointSliceMirroringController = in.EndpointSliceMirroringController
in.GarbageCollectorController.DeepCopyInto(&out.GarbageCollectorController)
in.HPAController.DeepCopyInto(&out.HPAController)
out.HPAController = in.HPAController
out.JobController = in.JobController
out.CronJobController = in.CronJobController
out.NamespaceController = in.NamespaceController

4
go.mod
View File

@ -11,10 +11,10 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210604114606-597d8a9937fd
k8s.io/api => k8s.io/api v0.0.0-20210604195109-9f22d1265651
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210604115743-b5974fa1ca35
k8s.io/client-go => k8s.io/client-go v0.0.0-20210604114835-71f81dc71522
k8s.io/client-go => k8s.io/client-go v0.0.0-20210604195650-ded678f91ed5
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210604121320-76ea31422598
k8s.io/component-base => k8s.io/component-base v0.0.0-20210604115352-a36b18ffecae
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210604121217-2c65c810b6b9

6
go.sum
View File

@ -619,12 +619,12 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210604114606-597d8a9937fd h1:Zl0QbEdpIgO6ZWwL9Sp8I3VuMkmHZ74wNppSQMAPnTE=
k8s.io/api v0.0.0-20210604114606-597d8a9937fd/go.mod h1:Dc7D5FRyGPPWEZ/WG9X2TOU/beNMsO3+S+lU1bhmKwo=
k8s.io/api v0.0.0-20210604195109-9f22d1265651 h1:LFzzwgGgkcMv0WU00X6zFNZ6SvH6bt4XppbeBS4WVec=
k8s.io/api v0.0.0-20210604195109-9f22d1265651/go.mod h1:Dc7D5FRyGPPWEZ/WG9X2TOU/beNMsO3+S+lU1bhmKwo=
k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f h1:DmoZH3nTdy0sXQ7iZ6Gd3b2DjLiCC8d2nWTLojwU7k4=
k8s.io/apimachinery v0.0.0-20210604114423-aec8116c445f/go.mod h1:5zcgojGmAy5Bo3S4mgZWAt6HwoKzaSh4MV3ITvlcOVM=
k8s.io/apiserver v0.0.0-20210604115743-b5974fa1ca35/go.mod h1:lXu8ezq7jcLDZYLec18G3SLfpfRNR4XKkV+XI+miDlY=
k8s.io/client-go v0.0.0-20210604114835-71f81dc71522/go.mod h1:OjmCoE7ifKXyCDHTOqW9Tt2Knriz/Ah8IkpJXA8Ux5c=
k8s.io/client-go v0.0.0-20210604195650-ded678f91ed5/go.mod h1:kSx8A96VUSpBA4jTX1ogcPiKm8hb7r1mbnUMpk0g/1w=
k8s.io/cloud-provider v0.0.0-20210604121320-76ea31422598 h1:wb6D27cnYlnfNkfnWA/DtJE1ieFdmescg6zB13WmWfs=
k8s.io/cloud-provider v0.0.0-20210604121320-76ea31422598/go.mod h1:xgg2g9qMDzgMcCx9Je/33JxzXRPEnWeMfqSvLf5UTTs=
k8s.io/component-base v0.0.0-20210604115352-a36b18ffecae h1:SrR3cXX+c4s3cGT2WPAM99/fGaeB9V1iR833PMNogsg=