From ec58d1865dfb4bf4cd7fc66225a84085469aeeed Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Tue, 10 Mar 2026 13:08:31 +0800 Subject: [PATCH] kubectl: only print default cotnainer if there are multi containers --- staging/src/k8s.io/kubectl/pkg/cmd/util/podcmd/podcmd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/util/podcmd/podcmd.go b/staging/src/k8s.io/kubectl/pkg/cmd/util/podcmd/podcmd.go index ea71cfe950c..72c2681ba04 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/util/podcmd/podcmd.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/util/podcmd/podcmd.go @@ -78,7 +78,7 @@ func FindOrDefaultContainerByName(pod *v1.Pod, name string, quiet bool, warn io. // fallback to pick the first container to maintain existing behavior container := &pod.Spec.Containers[0] - if !quiet { + if !quiet && (len(pod.Spec.Containers) > 1 || len(pod.Spec.InitContainers) > 0 || len(pod.Spec.EphemeralContainers) > 0) { fmt.Fprintf(warn, "Defaulted container %q out of: %s\n", container.Name, AllContainerNames(pod)) // nolint:errcheck } klog.V(4).Infof("Using the first container in a pod: %s", container.Name)