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

Fix list failure when patches are used (#1371) 

Fixes #1368
This commit is contained in:
KUOKA Yusuke 2020-07-22 22:33:45 +09:00 committed by GitHub
parent 1671b8ba7d
commit 1e956ae8a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/app/app.go
View File

@ -342,7 +342,7 @@ func (a *App) Test(c TestConfigProvider) error {
func (a *App) PrintState(c StateConfigProvider) error { func (a *App) PrintState(c StateConfigProvider) error {
return a.VisitDesiredStatesWithReleasesFiltered(a.FileOrDir, func(st *state.HelmState) (errs []error) { return a.VisitDesiredStatesWithReleasesFiltered(a.FileOrDir, func(st *state.HelmState) (errs []error) {
err := NewRun(st, nil, NewContext()).withPreparedCharts(false, "build", func() { err := NewRun(st, a.getHelm(st), NewContext()).withPreparedCharts(false, "build", func() {
state, err := st.ToYaml() state, err := st.ToYaml()
if err != nil { if err != nil {
errs = []error{err} errs = []error{err}
@ -365,7 +365,7 @@ func (a *App) ListReleases(c ListConfigProvider) error {
var releases []*HelmRelease var releases []*HelmRelease
err := a.VisitDesiredStatesWithReleasesFiltered(a.FileOrDir, func(st *state.HelmState) []error { err := a.VisitDesiredStatesWithReleasesFiltered(a.FileOrDir, func(st *state.HelmState) []error {
err := NewRun(st, nil, NewContext()).withPreparedCharts(false, "list", func() { err := NewRun(st, a.getHelm(st), NewContext()).withPreparedCharts(false, "list", func() {
//var releases m //var releases m
for _, r := range st.Releases { for _, r := range st.Releases {

4
pkg/app/run.go
View File

@ -22,6 +22,10 @@ type Run struct {
} }
func NewRun(st *state.HelmState, helm helmexec.Interface, ctx Context) *Run { func NewRun(st *state.HelmState, helm helmexec.Interface, ctx Context) *Run {
if helm == nil {
panic("Assertion failed: helmexec.Interface must not be nil")
}
return &Run{state: st, helm: helm, ctx: ctx} return &Run{state: st, helm: helm, ctx: ctx}
} }