Skip to content

fix(deploy): skip kubectl flag validation for configs with no deploy section #10111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aniskhan001 wants to merge 3 commits into
base: main
Choose a base branch
from
+38 −15
Open

fix(deploy): skip kubectl flag validation for configs with no deploy section #10111

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78e40b7
fix(deploy): skip kubectl flag validation for configs with no deploy …
aniskhan001 Jun 20, 2026
471d9fb
refactor: use direct field reference to avoid heap alloc in getDefaul…
aniskhan001 Jun 20, 2026
0c3c557
Merge branch 'main' into fix/10071-no-deploy-section-kubectl-flags-co…
aniskhan001 Jul 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions pkg/skaffold/runner/deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,23 +265,20 @@ func getDefaultDeployer(runCtx *runcontext.RunContext, labeller *label.DefaultLa
}
logPrefix = d.Logs.Prefix
}
var currentDefaultNamespace *string
var currentKubectlFlags latest.KubectlFlags
if d.KubectlDeploy != nil {
currentDefaultNamespace = d.KubectlDeploy.DefaultNamespace
currentKubectlFlags = d.KubectlDeploy.Flags
}
if kFlags == nil {
kFlags = &currentKubectlFlags
}
if err := validateKubectlFlags(kFlags, currentKubectlFlags); err != nil {
return nil, err
}
if currentDefaultNamespace != nil {
if defaultNamespace != nil && *defaultNamespace != *currentDefaultNamespace {
return nil, fmt.Errorf("found multiple namespaces in skaffold.yaml (not supported in `skaffold apply`): %s, %s", *defaultNamespace, *currentDefaultNamespace)
currentKubectlFlags := d.KubectlDeploy.Flags
if kFlags == nil {
kFlags = &currentKubectlFlags
}
if err := validateKubectlFlags(kFlags, currentKubectlFlags); err != nil {
return nil, err
}
Comment thread
aniskhan001 marked this conversation as resolved.
Outdated
if d.KubectlDeploy.DefaultNamespace != nil {
if defaultNamespace != nil && *defaultNamespace != *d.KubectlDeploy.DefaultNamespace {
return nil, fmt.Errorf("found multiple namespaces in skaffold.yaml (not supported in `skaffold apply`): %s, %s", *defaultNamespace, *d.KubectlDeploy.DefaultNamespace)
}
defaultNamespace = d.KubectlDeploy.DefaultNamespace
}
defaultNamespace = currentDefaultNamespace
}
}
if kFlags == nil {
Expand Down
27 changes: 27 additions & 0 deletions pkg/skaffold/runner/deployer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,33 @@ func TestGetDefaultDeployer(tOuter *testing.T) {
Flags: latest.KubectlFlags{},
}, nil, configNameForDefaultDeployer, nil)).(*kubectl.Deployer),
},
{
// Regression test for https://github.com/GoogleContainerTools/skaffold/issues/10071
// A dependency config with no deploy section (e.g. only resourceSelector) must not
// be treated as a conflicting set of kubectl deploy flags.
name: "parent config with kubectl flags and dependency config with no deploy section should not conflict",
cfgs: map[string]latest.DeployType{
"parent": {
KubectlDeploy: &latest.KubectlDeploy{
Flags: latest.KubectlFlags{
Apply: []string{"--server-side"},
},
},
},
"dependency": {},
},
expected: t.RequireNonNilResult(kubectl.NewDeployer(&runcontext.RunContext{
Pipelines: runcontext.NewPipelines(
map[string]latest.Pipeline{
"parent": {},
},
[]string{"default"}),
}, &label.DefaultLabeller{}, &latest.KubectlDeploy{
Flags: latest.KubectlFlags{
Apply: []string{"--server-side"},
},
}, nil, configNameForDefaultDeployer, nil)).(*kubectl.Deployer),
},
}

for _, test := range tests {
Expand Down