github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14732 from jszczepkowski/hpa-api-fix

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-01 18:52:59 -07:00
parent 2b1a0e98a2 a5194c5ff4
commit e4164638c4
8 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/describe.go
View File

@@ -1260,7 +1260,7 @@ func (d *HorizontalPodAutoscalerDescriber) Describe(namespace, name string) (str
hpa.Spec.Target.Resource)
fmt.Fprintf(out, "Current resource consumption:\t")
if hpa.Status != nil && hpa.Status.CurrentConsumption != nil {
if hpa.Status.CurrentConsumption != nil {
fmt.Fprintf(out, "%s %s\n",
hpa.Status.CurrentConsumption.Quantity.String(),
hpa.Status.CurrentConsumption.Resource)