diff --git a/internal/env/config.go b/internal/env/config.go index 53f3a7f..1c89cc6 100644 --- a/internal/env/config.go +++ b/internal/env/config.go @@ -54,6 +54,7 @@ type Config struct { Chart string `` // Chart argument to use in applicable helm commands Release string `` // Release argument to use in applicable helm commands Force bool `envconfig:"force_upgrade"` // Pass --force-replace to applicable helm commands + ForceConflicts bool `split_words:"true"` // Pass --force-conflicts to `helm upgrade` (ДОБАВЛЕНО) AtomicUpgrade bool `split_words:"true"` // Pass --atomic to `helm upgrade` CleanupOnFail bool `envconfig:"cleanup_failed_upgrade"` // Pass --cleanup-on-fail to `helm upgrade` LintStrictly bool `split_words:"true"` // Pass --strict to `helm lint` @@ -161,10 +162,6 @@ func (cfg *Config) deprecationWarn() { } } -// settingAliases provides alternate environment variable names for certain settings, either because -// they were renamed during drone-helm3's lifetime or for backward-compatibility with the original -// drone-helm. Most config options don't need to be included here; adding them to the main Config -// struct is sufficient. type settingAliases struct { Command string `envconfig:"helm_command"` AddRepos []string `envconfig:"helm_repos"`