From fc75f25293055003d8159a841940313e56a164c6 Mon Sep 17 00:00:00 2001 From: a-hat <51818964+a-hat@users.noreply.github.com> Date: Wed, 8 Jan 2020 00:48:29 +0100 Subject: [PATCH] do not pass --api-versions to "helm diff" (#1061) --- README.md | 4 ++-- pkg/app/app_test.go | 19 ------------------- pkg/state/state.go | 2 -- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 5389aa70..5a166734 100644 --- a/README.md +++ b/README.md @@ -270,11 +270,11 @@ bases: # # Advanced Configuration: API Capabilities # -# Some helmfile tasks render releases locally without querying an actual cluster (diff, apply, template), +# 'helmfile template' renders releases locally without querying an actual cluster, # and in this case `.Capabilities.APIVersions` cannot be populated. # When a chart queries for a specific CRD, this can lead to unexpected results. # -# Configure a fixed list of api versions to pass to helm via the --api-versions flag: +# Configure a fixed list of api versions to pass to 'helm template' via the --api-versions flag: apiVersions: - example/v1 diff --git a/pkg/app/app_test.go b/pkg/app/app_test.go index 5ef96c4b..aeee1fe3 100644 --- a/pkg/app/app_test.go +++ b/pkg/app/app_test.go @@ -3409,25 +3409,6 @@ Affected releases are: err: "foo" has dependency to inexistent release "bar" `, }, - { - name: "pass apiVersions to helm diff", - loc: location(), - files: map[string]string{ - "/path/to/helmfile.yaml": ` -apiVersions: -- xxx/v1 -releases: -- name: foo - chart: mychart1 -`, - }, - diffs: map[exectest.DiffKey]error{ - exectest.DiffKey{Name: "foo", Chart: "mychart1", Flags: "--kube-contextdefault--api-versionsxxx/v1--detailed-exitcode"}: helmexec.ExitError{Code: 2}, - }, - upgraded: []exectest.Release{ - {Name: "foo", Flags: []string{"--kube-context", "default"}}, - }, - }, } for i := range testcases { diff --git a/pkg/state/state.go b/pkg/state/state.go index 4130b03d..b5d9f528 100644 --- a/pkg/state/state.go +++ b/pkg/state/state.go @@ -1619,8 +1619,6 @@ func (st *HelmState) flagsForDiff(helm helmexec.Interface, release *ReleaseSpec, return nil, err } - flags = st.appendApiVersionsFlags(flags) - common, err := st.namespaceAndValuesFlags(helm, release, workerIndex) if err != nil { return nil, err