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

Merge pull request #91855 from SataQiu/fix-kubectl-2020060602 

kubectl: fix the bug that kubectl autoscale does not honor --name flag

Kubernetes-commit: 9ad74781c756fa2d9c4b328f594a933774bd5ef6
This commit is contained in:
Kubernetes Publisher 2020-07-09 00:04:10 -07:00
parent ecac7558af 4990be8686
commit 0dceec77b5
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -760,11 +760,11 @@
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "c1c508dd1e63"
"Rev": "962cbea96c57"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "1e6150831a96"
"Rev": "b9931a569116"
},
{
"ImportPath": "k8s.io/code-generator",

8
go.mod
View File

@ -36,8 +36,8 @@ require (
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20200706140252-6943fd7f818f
k8s.io/apimachinery v0.0.0-20200702090251-3c2682fedbf2
k8s.io/cli-runtime v0.0.0-20200702092705-c1c508dd1e63
k8s.io/client-go v0.0.0-20200703120315-1e6150831a96
k8s.io/cli-runtime v0.0.0-20200709135631-962cbea96c57
k8s.io/client-go v0.0.0-20200709131454-b9931a569116
k8s.io/component-base v0.0.0-20200702170821-b3613baa4e60
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
@ -51,8 +51,8 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20200706140252-6943fd7f818f
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200702090251-3c2682fedbf2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200702092705-c1c508dd1e63
k8s.io/client-go => k8s.io/client-go v0.0.0-20200703120315-1e6150831a96
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200709135631-962cbea96c57
k8s.io/client-go => k8s.io/client-go v0.0.0-20200709131454-b9931a569116
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200702090103-29a41fee4a12
k8s.io/component-base => k8s.io/component-base v0.0.0-20200702170821-b3613baa4e60
k8s.io/metrics => k8s.io/metrics v0.0.0-20200702092548-05982dac5179

4
go.sum
View File

@ -503,8 +503,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.0.0-20200706140252-6943fd7f818f/go.mod h1:PFJ2b4cud2iXU+DzN8Tf+HsJsN2KKcJUfbMmckp2bhI=
k8s.io/apimachinery v0.0.0-20200702090251-3c2682fedbf2/go.mod h1:87+lSRzC+mGLZTTwIcPY67sorIVlqPhdNrvsToaUUns=
k8s.io/cli-runtime v0.0.0-20200702092705-c1c508dd1e63/go.mod h1:yHzFQ1WrQIYwv31ZUelQn+rrinB/GNGNM4BGaV51A70=
k8s.io/client-go v0.0.0-20200703120315-1e6150831a96/go.mod h1:TlvCDNHtv58YP5GaIXe4USyRFvfXxi99PNTzT0JkNe0=
k8s.io/cli-runtime v0.0.0-20200709135631-962cbea96c57/go.mod h1:nP3o468qyggjrQYNvS4grCt6zWdNtryaOtuWY216Do0=
k8s.io/client-go v0.0.0-20200709131454-b9931a569116/go.mod h1:b0cTVbMcO/HXih+2s68zf46EsFP54Crh/D8jDcf5KjE=
k8s.io/code-generator v0.0.0-20200702090103-29a41fee4a12/go.mod h1:Ge7zjRdqyykyvjtJDWarkbGvfHIfpnlcXpfI36jitis=
k8s.io/component-base v0.0.0-20200702170821-b3613baa4e60/go.mod h1:lJJT3Us7yQo3JPMkF7G18sl3dWSHe6wrtFgrzX/7ucQ=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

11
pkg/cmd/autoscale/autoscale.go
View File

@ -78,7 +78,7 @@ type AutoscaleOptions struct {
dryRunStrategy cmdutil.DryRunStrategy
dryRunVerifier *resource.DryRunVerifier
builder *resource.Builder
generatorFunc func(string, *meta.RESTMapping) (generate.StructuredGenerator, error)
generatorFunc func(name, refName string, mapping *meta.RESTMapping) (generate.StructuredGenerator, error)
fieldManager string
HPAClient autoscalingv1client.HorizontalPodAutoscalersGetter
@ -170,7 +170,10 @@ func (o *AutoscaleOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args
o.HPAClient = kubeClient.AutoscalingV1()
// get the generator
o.generatorFunc = func(name string, mapping *meta.RESTMapping) (generate.StructuredGenerator, error) {
o.generatorFunc = func(name, refName string, mapping *meta.RESTMapping) (generate.StructuredGenerator, error) {
if len(name) == 0 {
name = refName
}
switch o.Generator {
case generateversioned.HorizontalPodAutoscalerV1GeneratorName:
return &generateversioned.HorizontalPodAutoscalerGeneratorV1{
@ -178,7 +181,7 @@ func (o *AutoscaleOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args
MinReplicas: o.Min,
MaxReplicas: o.Max,
CPUPercent: o.CPUPercent,
ScaleRefName: name,
ScaleRefName: refName,
ScaleRefKind: mapping.GroupVersionKind.Kind,
ScaleRefAPIVersion: mapping.GroupVersionKind.GroupVersion().String(),
}, nil
@ -240,7 +243,7 @@ func (o *AutoscaleOptions) Run() error {
return fmt.Errorf("cannot autoscale a %v: %v", mapping.GroupVersionKind.Kind, err)
}
generator, err := o.generatorFunc(info.Name, mapping)
generator, err := o.generatorFunc(o.Name, info.Name, mapping)
if err != nil {
return err
}