From 1e22b2fe7c06c771d5dd7177f4a13a510621b295 Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Sat, 16 Aug 2025 16:23:29 -0600 Subject: [PATCH] fix: remove redundant error check Signed-off-by: Terry Howe --- pkg/kube/client.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/kube/client.go b/pkg/kube/client.go index 016055392..a78ffd596 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -269,10 +269,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)))