mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 22:46:12 +00:00
Fix kubectl describe to display a container's resource limit env vars as
node allocatable when the limits are not set.
This commit is contained in:
parent
ff9980e203
commit
d794becfa4
@ -949,7 +949,11 @@ func describeContainers(label string, containers []api.Container, containerStatu
|
||||
if err != nil {
|
||||
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:
|
||||
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:
|
||||
|
Loading…
Reference in New Issue
Block a user