Skip to content

K
k3s
Commit cbbcfe8a authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #29849 from aveshagarwal/master-kubectl-describe-default-limits

Automatic merge from submit-queue Fix kubectl describe to display a container's resource limit env vars as node allocatable when the limits are not set
parents 41458249 d794becf
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
pkg/kubectl/describe.go
View file @ cbbcfe8a
...@@ -949,7 +949,11 @@ func describeContainers(label string, containers []api.Container, containerStatu ...@@ -949,7 +949,11 @@ func describeContainers(label string, containers []api.Container, containerStatu
if err != nil { if err != nil {
valueFrom = "" valueFrom = ""
} }
fmt.Fprintf(out, " %s:\t%s (%s)\n", e.Name, valueFrom, e.ValueFrom.ResourceFieldRef.Resource) resource := e.ValueFrom.ResourceFieldRef.Resource
if valueFrom == "0" && (resource == "limits.cpu" || resource == "limits.memory") {
valueFrom = "node allocatable"
}
fmt.Fprintf(out, " %s:\t%s (%s)\n", e.Name, valueFrom, resource)
case e.ValueFrom.SecretKeyRef != nil: case e.ValueFrom.SecretKeyRef != nil:
fmt.Fprintf(out, " %s:\t<set to the key '%s' in secret '%s'>\n", e.Name, e.ValueFrom.SecretKeyRef.Key, e.ValueFrom.SecretKeyRef.Name) fmt.Fprintf(out, " %s:\t<set to the key '%s' in secret '%s'>\n", e.Name, e.ValueFrom.SecretKeyRef.Key, e.ValueFrom.SecretKeyRef.Name)
case e.ValueFrom.ConfigMapKeyRef != nil: case e.ValueFrom.ConfigMapKeyRef != nil:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment