From 6f6fd13f55e0797779c056a1f6f85396e631cf39 Mon Sep 17 00:00:00 2001 From: naumso Date: Thu, 13 Aug 2026 19:02:16 +0300 Subject: [PATCH] upd --- .drone.yml | 4 ++-- Dockerfile | 2 +- docs/parameter_reference.md | 2 +- internal/env/config.go | 2 +- internal/run/upgrade.go | 2 +- internal/run/upgrade_test.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 582ce95..6cd0d2e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: tags: - git-${DRONE_COMMIT_SHA:0:7} - latest - - 4.2.3 + - 4.2.4 username: from_secret: harbor-username password: @@ -32,6 +32,6 @@ steps: --- kind: signature -hmac: 1712d86941d5494cee19bfeb87ed7574d6258b1a6050d0d99cdcb5dc5397ebf0 +hmac: effeee9a3c487ef54b09028d316dc4f81b12a4e28fc845fc6bb4d10f2762169e ... diff --git a/Dockerfile b/Dockerfile index 40383c1..654abda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ COPY --link . . RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /go/bin/drone-helm ./cmd/drone-helm # --- Copy the cli to an image with helm already installed --- -FROM alpine/helm:4.2.3 +FROM alpine/helm:4.2.4 COPY --link --from=builder /go/bin/drone-helm /bin/drone-helm COPY --link ./assets/kubeconfig.tpl /root/.kube/config.tpl diff --git a/docs/parameter_reference.md b/docs/parameter_reference.md index c7a9c1d..b26275d 100644 --- a/docs/parameter_reference.md +++ b/docs/parameter_reference.md @@ -41,7 +41,7 @@ Installations are triggered when the `mode` setting is "upgrade." They can also | dependencies_action | string | | | Calls `helm dependency build` OR `helm dependency update` before running the main command. Possible values: `build`, `update`. | | 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` to `helm upgrade`. | +| force_upgrade | boolean | | force | Pass `--force-replace` 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/env/config.go b/internal/env/config.go index 0317eb8..53f3a7f 100644 --- a/internal/env/config.go +++ b/internal/env/config.go @@ -53,7 +53,7 @@ type Config struct { Timeout string `` // Argument to pass to --timeout in applicable helm commands 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 to applicable helm commands + Force bool `envconfig:"force_upgrade"` // Pass --force-replace to applicable helm commands 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` diff --git a/internal/run/upgrade.go b/internal/run/upgrade.go index 1c07d2f..d4d30c2 100644 --- a/internal/run/upgrade.go +++ b/internal/run/upgrade.go @@ -88,7 +88,7 @@ func (u *Upgrade) Prepare() error { args = append(args, "--timeout", u.timeout) } if u.force { - args = append(args, "--force") + args = append(args, "--force-replace") } if u.atomic { args = append(args, "--atomic") diff --git a/internal/run/upgrade_test.go b/internal/run/upgrade_test.go index 3313eec..d3926a5 100644 --- a/internal/run/upgrade_test.go +++ b/internal/run/upgrade_test.go @@ -151,7 +151,7 @@ func (suite *UpgradeTestSuite) TestPrepareWithUpgradeFlags() { "--wait", "--reuse-values", "--timeout", "sit_in_the_corner", - "--force", + "--force-replace", "--atomic", "--cleanup-on-fail", "--set", "age=35",