From 87e894f310a60f9e8f193b4379085535982b3760 Mon Sep 17 00:00:00 2001 From: Marc Sutter Date: Mon, 8 Jul 2019 14:00:36 +0200 Subject: [PATCH 1/2] enhance config syntax to accept adopt: [NS/KIND/RESOURCE_NAME] at the release level so that helmfile calls helm-x to transparently import existing resources at the installation time. --- pkg/state/helmx.go | 4 ++++ pkg/state/state.go | 1 + 2 files changed, 5 insertions(+) diff --git a/pkg/state/helmx.go b/pkg/state/helmx.go index d8a73e2ab..c48ff4003 100644 --- a/pkg/state/helmx.go +++ b/pkg/state/helmx.go @@ -19,6 +19,10 @@ func (st *HelmState) appendHelmXFlags(flags []string, release *ReleaseSpec) ([]s flags = append(flags, "--dependency", dep) } + for _, adopt := range release.Adopt { + flags = append(flags, "--adopt", adopt) + } + jsonPatches := release.JSONPatches if len(jsonPatches) > 0 { generatedFiles, err := st.generateTemporaryValuesFiles(jsonPatches, release.MissingFileHandler) diff --git a/pkg/state/state.go b/pkg/state/state.go index 1654fd484..f617d9f83 100644 --- a/pkg/state/state.go +++ b/pkg/state/state.go @@ -165,6 +165,7 @@ type ReleaseSpec struct { Dependencies []Dependency `yaml:"dependencies"` JSONPatches []interface{} `yaml:"jsonPatches"` StrategicMergePatches []interface{} `yaml:"strategicMergePatches"` + Adopt []string `yaml:"adopt"` // generatedValues are values that need cleaned up on exit generatedValues []string From 6b19df18805d1364c39ab480f95db60b3ad3b945 Mon Sep 17 00:00:00 2001 From: Marc Sutter Date: Mon, 8 Jul 2019 14:16:56 +0200 Subject: [PATCH 2/2] fix double space --- pkg/state/helmx.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/state/helmx.go b/pkg/state/helmx.go index c48ff4003..92e11441d 100644 --- a/pkg/state/helmx.go +++ b/pkg/state/helmx.go @@ -19,7 +19,7 @@ func (st *HelmState) appendHelmXFlags(flags []string, release *ReleaseSpec) ([]s flags = append(flags, "--dependency", dep) } - for _, adopt := range release.Adopt { + for _, adopt := range release.Adopt { flags = append(flags, "--adopt", adopt) }