@@ -47,6 +47,7 @@ func NewUpgrade(cfg env.Config) *Upgrade {
|
|||||||
reuseValues: cfg.ReuseValues,
|
reuseValues: cfg.ReuseValues,
|
||||||
timeout: cfg.Timeout,
|
timeout: cfg.Timeout,
|
||||||
force: cfg.Force,
|
force: cfg.Force,
|
||||||
|
forceConflict: cfg.ForceConflicts, // FIXED: Added missing struct mapping
|
||||||
atomic: cfg.AtomicUpgrade,
|
atomic: cfg.AtomicUpgrade,
|
||||||
cleanupOnFail: cfg.CleanupOnFail,
|
cleanupOnFail: cfg.CleanupOnFail,
|
||||||
historyMax: cfg.HistoryMax,
|
historyMax: cfg.HistoryMax,
|
||||||
@@ -70,6 +71,11 @@ func (u *Upgrade) Prepare() error {
|
|||||||
return fmt.Errorf("release is required")
|
return fmt.Errorf("release is required")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Validation: prevent generating invalid flags together
|
||||||
|
if u.force && u.forceConflict {
|
||||||
|
return fmt.Errorf("cannot use both 'force' (--force-replace) and 'force_conflicts' (--force-conflicts) together")
|
||||||
|
}
|
||||||
|
|
||||||
args := u.globalFlags()
|
args := u.globalFlags()
|
||||||
args = append(args, "upgrade", "--install")
|
args = append(args, "upgrade", "--install")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user