github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15997 from JanetKuo/kubectl-get-hpa-minpods

Browse Source 
Handle the case when min pods is nil for "kubectl get hpa"
This commit is contained in:
Filip Grzadkowski 2015-10-22 14:47:14 +02:00
commit 39e6a60224
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubectl/resource_printer.go
View File

@ -1388,7 +1388,7 @@ func printHorizontalPodAutoscaler(hpa *extensions.HorizontalPodAutoscaler, w io.
hpa.Spec.ScaleRef.Namespace,
hpa.Spec.ScaleRef.Name,
hpa.Spec.ScaleRef.Subresource)
target := "<unknown>"
target := "<unset>"
if hpa.Spec.CPUUtilization != nil {
target = fmt.Sprintf("%d%%", hpa.Spec.CPUUtilization.TargetPercentage)
}
@ -1396,7 +1396,10 @@ func printHorizontalPodAutoscaler(hpa *extensions.HorizontalPodAutoscaler, w io.
if hpa.Status.CurrentCPUUtilizationPercentage != nil {
current = fmt.Sprintf("%d%%", *hpa.Status.CurrentCPUUtilizationPercentage)
}
minPods := hpa.Spec.MinReplicas
minPods := "<unset>"
if hpa.Spec.MinReplicas != nil {
minPods = fmt.Sprintf("%d", *hpa.Spec.MinReplicas)
}
maxPods := hpa.Spec.MaxReplicas
if withNamespace {
if _, err := fmt.Fprintf(w, "%s\t", namespace); err != nil {
@ -1404,12 +1407,12 @@ func printHorizontalPodAutoscaler(hpa *extensions.HorizontalPodAutoscaler, w io.
}
}
if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%d\t%d\t%s",
if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%d\t%s",
name,
reference,
target,
current,
*minPods,
minPods,
maxPods,
translateTimestamp(hpa.CreationTimestamp),
); err != nil {