public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(cmd/deps): make `helmfile deps` to work w/ helm 3.0.0-beta.3 (#842) 

Ref https://github.com/roboll/helmfile/issues/668#issuecomment-529054165
This commit is contained in:
KUOKA Yusuke 2019-09-07 22:06:29 +09:00 committed by GitHub
parent 4e4f1bee59
commit 4bbd09ccb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/state/chart_dependency.go
View File

@ -278,8 +278,31 @@ func (m *chartDependencyManager) lockFileName() string {
} }
func (m *chartDependencyManager) Update(shell helmexec.DependencyUpdater, wd string, unresolved *UnresolvedDependencies) (*ResolvedDependencies, error) { func (m *chartDependencyManager) Update(shell helmexec.DependencyUpdater, wd string, unresolved *UnresolvedDependencies) (*ResolvedDependencies, error) {
if isHelm3() {
return m.updateHelm3(shell, wd, unresolved)
}
return m.updateHelm2(shell, wd, unresolved)
}
func (m *chartDependencyManager) updateHelm3(shell helmexec.DependencyUpdater, wd string, unresolved *UnresolvedDependencies) (*ResolvedDependencies, error) {
// Generate `Chart.yaml` of the temporary local chart // Generate `Chart.yaml` of the temporary local chart
if err := m.writeBytes(filepath.Join(wd, "Chart.yaml"), []byte(fmt.Sprintf("name: %s\n", m.Name))); err != nil { chartMetaContent := fmt.Sprintf("name: %s\nversion: 1.0.0\n", m.Name)
// Generate `requirements.yaml` of the temporary local chart from the helmfile state
reqsContent, err := yaml.Marshal(unresolved.ToChartRequirements())
if err != nil {
return nil, err
}
if err := m.writeBytes(filepath.Join(wd, "Chart.yaml"), []byte(chartMetaContent+string(reqsContent))); err != nil {
return nil, err
}
return m.doUpdate("Chart.lock", unresolved, shell, wd)
}
func (m *chartDependencyManager) updateHelm2(shell helmexec.DependencyUpdater, wd string, unresolved *UnresolvedDependencies) (*ResolvedDependencies, error) {
// Generate `Chart.yaml` of the temporary local chart
if err := m.writeBytes(filepath.Join(wd, "Chart.yaml"), []byte(fmt.Sprintf("name: %s\nversion: 1.0.0\n", m.Name))); err != nil {
return nil, err return nil, err
} }
@ -292,6 +315,11 @@ func (m *chartDependencyManager) Update(shell helmexec.DependencyUpdater, wd str
return nil, err return nil, err
} }
return m.doUpdate("requirements.lock", unresolved, shell, wd)
}
func (m *chartDependencyManager) doUpdate(chartLockFile string, unresolved *UnresolvedDependencies, shell helmexec.DependencyUpdater, wd string) (*ResolvedDependencies, error) {
// Generate `requirements.lock` of the temporary local chart by coping `<basename>.lock` // Generate `requirements.lock` of the temporary local chart by coping `<basename>.lock`
lockFile := m.lockFileName() lockFile := m.lockFileName()
@ -301,7 +329,7 @@ func (m *chartDependencyManager) Update(shell helmexec.DependencyUpdater, wd str
} }
if lockFileContent != nil { if lockFileContent != nil {
if err := m.writeBytes(filepath.Join(wd, "requirements.lock"), lockFileContent); err != nil { if err := m.writeBytes(filepath.Join(wd, chartLockFile), lockFileContent); err != nil {
return nil, err return nil, err
} }
} }
@ -311,7 +339,7 @@ func (m *chartDependencyManager) Update(shell helmexec.DependencyUpdater, wd str
return nil, err return nil, err
} }
updatedLockFileContent, err := m.readBytes(filepath.Join(wd, "requirements.lock")) updatedLockFileContent, err := m.readBytes(filepath.Join(wd, chartLockFile))
if err != nil { if err != nil {
return nil, err return nil, err
} }

6
pkg/state/state.go
View File

@ -896,7 +896,7 @@ func (st *HelmState) DeleteReleases(affectedReleases *AffectedReleases, helm hel
} }
flags := []string{} flags := []string{}
if purge && !st.isHelm3() { if purge && !isHelm3() {
flags = append(flags, "--purge") flags = append(flags, "--purge")
} }
flags = st.appendConnectionFlags(flags, &release) flags = st.appendConnectionFlags(flags, &release)
@ -931,7 +931,7 @@ func (st *HelmState) TestReleases(helm helmexec.Interface, cleanup bool, timeout
flags = append(flags, "--cleanup") flags = append(flags, "--cleanup")
} }
duration := strconv.Itoa(timeout) duration := strconv.Itoa(timeout)
if st.isHelm3() { if isHelm3() {
duration += "s" duration += "s"
} }
flags = append(flags, "--timeout", duration) flags = append(flags, "--timeout", duration)
@ -941,7 +941,7 @@ func (st *HelmState) TestReleases(helm helmexec.Interface, cleanup bool, timeout
}) })
} }
func (st *HelmState) isHelm3() bool { func isHelm3() bool {
return os.Getenv("HELMFILE_HELM3") != "" return os.Getenv("HELMFILE_HELM3") != ""
} }