yxxhero d613c5484c feat: add --force-conflicts flag support for Helm 4 (#2480) ...

* feat: add --force-conflicts flag support for Helm 4

Add support for Helm 4's --force-conflicts flag which forces server-side
apply changes against conflicts. This flag is mutually exclusive with
--force/--force-replace and only available in Helm 4.

Fixes #2429

Signed-off-by: yxxhero <aiopsclub@163.com>

* fix: address review comments on force-conflicts feature

- Fix comment grammar: 'forces' instead of 'force'
- Improve error messages to indicate both sources (releases[] and helmDefaults)
- Add test case for helmDefaults.forceConflicts with Helm 3 (should error)
- Update TestGenerateID expected hashes after adding ForceConflicts field to structs

Signed-off-by: yxxhero <aiopsclub@163.com>

---------

Signed-off-by: yxxhero <aiopsclub@163.com>

2026-03-14 08:44:44 +08:00

..

app

fix: nested helmfile values should replace arrays, not merge element-by-element (#2458)

2026-03-09 18:31:21 +08:00

argparser

fix #1095 (#1100)

2023-11-01 11:55:55 +08:00

cluster

feat: kubedog integration with unified resource handling (#2383)

2026-03-02 17:15:12 +08:00

config

feat: add helm-legacy track mode for Helm v4 compatibility (#2466)

2026-03-08 11:51:14 +08:00

environment

fix: array merge regression - layer arrays now replace defaults (#2367)

2026-01-18 14:04:54 +08:00

envvar

Add parameter to render helmfile as go template without .gotmpl extension (#2312)

2025-12-09 14:41:47 +09:00

errors

build(deps): bump golangci/golangci-lint-action from 6 to 7 (#1975)

2025-03-28 07:52:06 +08:00

event

feat: include func support (#1187)

2023-12-04 21:51:01 +08:00

exectest

feat: add helmfile unittest command for helm-unittest integration (#2400)

2026-02-16 09:45:10 +08:00

filesystem

refactor(filesystem): add CopyDir method and optimize Fetch function (#2111)

2025-07-28 16:10:25 -04:00

hcllang

feat: Add IP Network to supported HCL Functions (#2426)

2026-02-26 17:20:48 +08:00

helmexec

fix: support XDG-style multiple paths in HELM_PLUGINS (#2412)

2026-02-20 15:27:34 +08:00

kubedog

feat: add helm-legacy track mode for Helm v4 compatibility (#2466)

2026-03-08 11:51:14 +08:00

maputil

fix: array merge regression - layer arrays now replace defaults (#2367)

2026-01-18 14:04:54 +08:00

plugins

Fix AWS SDK debug logging by making it configurable (issue #2270) (#2290)

2025-11-24 18:27:04 +08:00

policy

build(deps): bump golangci/golangci-lint-action from 6 to 7 (#1975)

2025-03-28 07:52:06 +08:00

remote

fix: include query params in HTTP getter cache key (#2399)

2026-02-14 09:31:53 +08:00

resource

feat: kubedog integration with unified resource handling (#2383)

2026-03-02 17:15:12 +08:00

runtime

refactor(yaml): switch yaml library import paths from gopkg.in to go.yaml.in (#2114)

2025-08-01 11:28:39 +08:00

state

feat: add --force-conflicts flag support for Helm 4 (#2480)

2026-03-14 08:44:44 +08:00

testhelper

fix: eliminate os.Chdir in sequential helmfiles to fix relative path resolution (#2410)

2026-02-22 09:21:46 +08:00

testutil

feat: add helmfile unittest command for helm-unittest integration (#2400)

2026-02-16 09:45:10 +08:00

tmpl

refactor(yaml): switch yaml library import paths from gopkg.in to go.yaml.in (#2114)

2025-08-01 11:28:39 +08:00

yaml

refactor(yaml): switch yaml library import paths from gopkg.in to go.yaml.in (#2114)

2025-08-01 11:28:39 +08:00