From b0b70bdfa7de1fb3834306da3ad49cff21dbbe5a Mon Sep 17 00:00:00 2001 From: Andreas Bergmeier <51448674+AndreasBergmeier6176@users.noreply.github.com> Date: Thu, 16 Jan 2025 15:51:45 +0100 Subject: [PATCH] fix: Make defaultNamespace warning more useful Previously warning was printed in any case of multiple `defaultNamespace`s. Now it only gets printed when there are actual different namespaces configured. Also mentions said namespaces. --- pkg/skaffold/runner/runcontext/context.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/skaffold/runner/runcontext/context.go b/pkg/skaffold/runner/runcontext/context.go index cad809bb092..55504a51723 100644 --- a/pkg/skaffold/runner/runcontext/context.go +++ b/pkg/skaffold/runner/runcontext/context.go @@ -284,8 +284,8 @@ func (rc *RunContext) GetNamespace() string { var defaultNamespace string for _, p := range rc.GetPipelines() { if p.Deploy.KubectlDeploy != nil && p.Deploy.KubectlDeploy.DefaultNamespace != nil { - if defaultNamespace != "" { - log.Entry(context.TODO()).Warn("multiple deploy.kubectl.defaultNamespace values set, only last pipeline's value will be used") + if defaultNamespace != "" && defaultNamespace != *p.Deploy.KubectlDeploy.DefaultNamespace { + log.Entry(context.TODO()).Warnf("multiple deploy.kubectl.defaultNamespace values set (%s, %s), only last pipeline's value will be used", defaultNamespace, *p.Deploy.KubectlDeploy.DefaultNamespace) } defaultNamespace = *p.Deploy.KubectlDeploy.DefaultNamespace }