force-conflict

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`. |

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")
 	}