From 0243454008b4131299bccf56c184baa450206702 Mon Sep 17 00:00:00 2001 From: naumso Date: Thu, 13 Aug 2026 19:09:15 +0300 Subject: [PATCH] force-conflict --- docs/parameter_reference.md | 1 + internal/run/upgrade.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/docs/parameter_reference.md b/docs/parameter_reference.md index b26275d..f734843 100644 --- a/docs/parameter_reference.md +++ b/docs/parameter_reference.md @@ -42,6 +42,7 @@ Installations are triggered when the `mode` setting is "upgrade." They can also | wait_for_upgrade | boolean | | wait | Wait until kubernetes resources are in a ready state before marking the installation successful. | | timeout | duration | | | Timeout for any *individual* Kubernetes operation. The installation's full runtime may exceed this duration. | | force_upgrade | boolean | | force | Pass `--force-replace` to `helm upgrade`. | +| force_conflicts | boolean | | foforce_conflictsrce | Pass `--force-conflicts` to `helm upgrade`. | | atomic_upgrade | boolean | | | Pass `--atomic` to `helm upgrade`. | | cleanup_failed_upgrade | boolean | | | Pass `--cleanup-on-fail` to `helm upgrade`. | | history_max | int | | | Pass `--history-max` to `helm upgrade`. | diff --git a/internal/run/upgrade.go b/internal/run/upgrade.go index d4d30c2..80d8084 100644 --- a/internal/run/upgrade.go +++ b/internal/run/upgrade.go @@ -21,6 +21,7 @@ type Upgrade struct { reuseValues bool timeout string force bool + forceConflict bool atomic bool cleanupOnFail bool historyMax int @@ -90,6 +91,9 @@ func (u *Upgrade) Prepare() error { if u.force { args = append(args, "--force-replace") } + if u.forceConflict { + args = append(args, "--force-conflicts") + } if u.atomic { args = append(args, "--atomic") }