diff --git a/pkg/state/helmx.go b/pkg/state/helmx.go new file mode 100644 index 000000000..d8a73e2ab --- /dev/null +++ b/pkg/state/helmx.go @@ -0,0 +1,51 @@ +package state + +type Dependency struct { + Chart string `yaml:"chart"` + Version string `yaml:"version"` + Alias string `yaml:"alias"` +} + +func (st *HelmState) appendHelmXFlags(flags []string, release *ReleaseSpec) ([]string, error) { + for _, d := range release.Dependencies { + var dep string + if d.Alias != "" { + dep += d.Alias + "=" + } + dep += d.Chart + if d.Version != "" { + dep += ":" + d.Version + } + flags = append(flags, "--dependency", dep) + } + + jsonPatches := release.JSONPatches + if len(jsonPatches) > 0 { + generatedFiles, err := st.generateTemporaryValuesFiles(jsonPatches, release.MissingFileHandler) + if err != nil { + return nil, err + } + + for _, f := range generatedFiles { + flags = append(flags, "--json-patch", f) + } + + release.generatedValues = append(release.generatedValues, generatedFiles...) + } + + strategicMergePatches := release.StrategicMergePatches + if len(strategicMergePatches) > 0 { + generatedFiles, err := st.generateTemporaryValuesFiles(strategicMergePatches, release.MissingFileHandler) + if err != nil { + return nil, err + } + + for _, f := range generatedFiles { + flags = append(flags, "--strategic-merge-patch", f) + } + + release.generatedValues = append(release.generatedValues, generatedFiles...) + } + + return flags, nil +} diff --git a/pkg/state/state.go b/pkg/state/state.go index a13040243..3bf450faa 100644 --- a/pkg/state/state.go +++ b/pkg/state/state.go @@ -158,6 +158,11 @@ type ReleaseSpec struct { TLSKey string `yaml:"tlsKey"` TLSCert string `yaml:"tlsCert"` + // These settings requires helm-x integration to work + Dependencies []Dependency `yaml:"dependencies"` + JSONPatches []interface{} `yaml:"jsonPatches"` + StrategicMergePatches []interface{} `yaml:"strategicMergePatches"` + // generatedValues are values that need cleaned up on exit generatedValues []string //version of the chart that has really been installed cause desired version may be fuzzy (~2.0.0) @@ -1198,6 +1203,12 @@ func (st *HelmState) flagsForUpgrade(helm helmexec.Interface, release *ReleaseSp flags = st.appendTillerFlags(flags, release) + var err error + flags, err = st.appendHelmXFlags(flags, release) + if err != nil { + return nil, err + } + common, err := st.namespaceAndValuesFlags(helm, release, workerIndex) if err != nil { return nil, err @@ -1209,6 +1220,13 @@ func (st *HelmState) flagsForTemplate(helm helmexec.Interface, release *ReleaseS flags := []string{ "--name", release.Name, } + + var err error + flags, err = st.appendHelmXFlags(flags, release) + if err != nil { + return nil, err + } + common, err := st.namespaceAndValuesFlags(helm, release, workerIndex) if err != nil { return nil, err @@ -1228,6 +1246,12 @@ func (st *HelmState) flagsForDiff(helm helmexec.Interface, release *ReleaseSpec, flags = st.appendTillerFlags(flags, release) + var err error + flags, err = st.appendHelmXFlags(flags, release) + if err != nil { + return nil, err + } + common, err := st.namespaceAndValuesFlags(helm, release, workerIndex) if err != nil { return nil, err @@ -1245,7 +1269,17 @@ func (st *HelmState) isDevelopment(release *ReleaseSpec) bool { } func (st *HelmState) flagsForLint(helm helmexec.Interface, release *ReleaseSpec, workerIndex int) ([]string, error) { - return st.namespaceAndValuesFlags(helm, release, workerIndex) + flags, err := st.namespaceAndValuesFlags(helm, release, workerIndex) + if err != nil { + return nil, err + } + + flags, err = st.appendHelmXFlags(flags, release) + if err != nil { + return nil, err + } + + return flags, nil } func (st *HelmState) RenderValuesFileToBytes(path string) ([]byte, error) {