upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-05-28 04:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #31143 from TerryHowe/fix-remove-redundant-error-check

Browse source 
fix: remove redundant error check
This commit is contained in:
George Jenkins 2025-09-25 08:12:37 -07:00 committed by GitHub
commit 61e3d95a94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/kube/client.go
View file

@ -271,10 +271,6 @@ func (c *Client) Create(resources ResourceList, options ...ClientCreateOption) (
return nil, fmt.Errorf("invalid client create option(s): %w", err)
}
if createOptions.forceConflicts && !createOptions.serverSideApply {
return nil, fmt.Errorf("invalid operation: force conflicts can only be used with server-side apply")
}
makeCreateApplyFunc := func() func(target *resource.Info) error {
if createOptions.serverSideApply {
slog.Debug("using server-side apply for resource creation", slog.Bool("forceConflicts", createOptions.forceConflicts), slog.Bool("dryRun", createOptions.dryRun), slog.String("fieldValidationDirective", string(createOptions.fieldValidationDirective)))