fixup! fixup! Fix race while running `helm dep build` on local chart
This commit is contained in:
parent
8a43e8f782
commit
9e54af5c2c
|
|
@ -928,7 +928,7 @@ func (st *HelmState) PrepareCharts(helm helmexec.Interface, dir string, concurre
|
||||||
// a broken remote chart won't completely block their job.
|
// a broken remote chart won't completely block their job.
|
||||||
chartPath = normalizeChart(st.basePath, chartPath)
|
chartPath = normalizeChart(st.basePath, chartPath)
|
||||||
|
|
||||||
buildDeps = true
|
buildDeps = !opts.SkipRepos
|
||||||
} else if !opts.ForceDownload {
|
} else if !opts.ForceDownload {
|
||||||
// At this point, we are sure that either:
|
// At this point, we are sure that either:
|
||||||
// 1. It is a local chart and we can use it in later process (helm upgrade/template/lint/etc)
|
// 1. It is a local chart and we can use it in later process (helm upgrade/template/lint/etc)
|
||||||
|
|
@ -1011,7 +1011,7 @@ func (st *HelmState) PrepareCharts(helm helmexec.Interface, dir string, concurre
|
||||||
return nil, errs
|
return nil, errs
|
||||||
}
|
}
|
||||||
|
|
||||||
if !opts.SkipRepos {
|
if len(builds) > 0 {
|
||||||
if err := st.runHelmDepBuilds(helm, concurrency, builds); err != nil {
|
if err := st.runHelmDepBuilds(helm, concurrency, builds); err != nil {
|
||||||
return nil, []error{err}
|
return nil, []error{err}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue