From e482a144c1b452d6069621389edc3edd1022382f Mon Sep 17 00:00:00 2001 From: George Kaz Date: Tue, 20 Jul 2021 19:21:44 +0100 Subject: [PATCH] add skip-crds flag support Signed-off-by: George Kaz --- Dockerfile | 2 +- docs/parameter_reference.md | 1 + internal/env/config.go | 1 + internal/run/upgrade.go | 5 +++++ internal/run/upgrade_test.go | 24 ++++++++++++++++++++++++ 5 files changed, 32 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 746f330..ded0c2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine/helm:3.2.4 +FROM alpine/helm:3.6.2 MAINTAINER Erin Call COPY build/drone-helm /bin/drone-helm diff --git a/docs/parameter_reference.md b/docs/parameter_reference.md index 6942e8b..80fd14d 100644 --- a/docs/parameter_reference.md +++ b/docs/parameter_reference.md @@ -50,6 +50,7 @@ Installations are triggered when the `mode` setting is "upgrade." They can also | reuse_values | boolean | | | Reuse the values from a previous release. | | skip_tls_verify | boolean | | | Connect to the Kubernetes cluster without checking for a valid TLS certificate. Not recommended in production. This is ignored if `skip_kubeconfig` is `true`. | | create_namespace | boolean | | | Pass --create-namespace to `helm upgrade`. | +| skip_crds | boolean | | | Pass --skip-crds to `helm upgrade`. | ## Uninstallation diff --git a/internal/env/config.go b/internal/env/config.go index 0f5c889..d80c697 100644 --- a/internal/env/config.go +++ b/internal/env/config.go @@ -52,6 +52,7 @@ type Config struct { 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` + SkipCrds bool `split_words:"true"` // Pass --skip-crds to `helm upgrade` Stdout io.Writer `ignored:"true"` Stderr io.Writer `ignored:"true"` diff --git a/internal/run/upgrade.go b/internal/run/upgrade.go index dc224e1..718d173 100644 --- a/internal/run/upgrade.go +++ b/internal/run/upgrade.go @@ -24,6 +24,7 @@ type Upgrade struct { cleanupOnFail bool certs *repoCerts createNamespace bool + skipCrds bool cmd cmd } @@ -47,6 +48,7 @@ func NewUpgrade(cfg env.Config) *Upgrade { cleanupOnFail: cfg.CleanupOnFail, certs: newRepoCerts(cfg), createNamespace: cfg.CreateNamespace, + skipCrds: cfg.SkipCrds, } } @@ -100,6 +102,9 @@ func (u *Upgrade) Prepare() error { if u.createNamespace { args = append(args, "--create-namespace") } + if u.skipCrds { + args = append(args, "--skip-crds") + } for _, vFile := range u.valuesFiles { args = append(args, "--values", vFile) } diff --git a/internal/run/upgrade_test.go b/internal/run/upgrade_test.go index aeba26d..0d60d2c 100644 --- a/internal/run/upgrade_test.go +++ b/internal/run/upgrade_test.go @@ -220,3 +220,27 @@ func (suite *UpgradeTestSuite) TestPrepareDebugFlag() { suite.Equal(want, stderr.String()) suite.Equal("", stdout.String()) } + +func (suite *UpgradeTestSuite) TestPrepareSkipCrdsFlag() { + defer suite.ctrl.Finish() + + cfg := env.Config{ + Chart: "at40", + Release: "cabbages_smell_great", + SkipCrds: true, + } + u := NewUpgrade(cfg) + + command = func(path string, args ...string) cmd { + suite.Equal(helmBin, path) + suite.Equal([]string{"upgrade", "--install", "--skip-crds", "cabbages_smell_great", "at40"}, args) + + return suite.mockCmd + } + + suite.mockCmd.EXPECT().Stdout(gomock.Any()) + suite.mockCmd.EXPECT().Stderr(gomock.Any()) + + err := u.Prepare() + suite.Require().Nil(err) +}