Add --post-render support also for diff
Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
parent
608bb0b525
commit
c2e7804479
|
|
@ -446,6 +446,11 @@ func (helm *execer) DiffRelease(context HelmContext, name, chart string, suppres
|
||||||
enableLiveOutput := false
|
enableLiveOutput := false
|
||||||
overrideEnableLiveOutput = &enableLiveOutput
|
overrideEnableLiveOutput = &enableLiveOutput
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if helm.IsHelm3() && helm.postRenderer != "" {
|
||||||
|
flags = append(flags, "--post-renderer", helm.postRenderer)
|
||||||
|
}
|
||||||
|
|
||||||
out, err := helm.exec(append(append(preArgs, "diff", "upgrade", "--allow-unreleased", name, chart), flags...), env, overrideEnableLiveOutput)
|
out, err := helm.exec(append(append(preArgs, "diff", "upgrade", "--allow-unreleased", name, chart), flags...), env, overrideEnableLiveOutput)
|
||||||
// Do our best to write STDOUT only when diff existed
|
// Do our best to write STDOUT only when diff existed
|
||||||
// Unfortunately, this works only when you run helmfile with `--detailed-exitcode`
|
// Unfortunately, this works only when you run helmfile with `--detailed-exitcode`
|
||||||
|
|
|
||||||
|
|
@ -2605,6 +2605,14 @@ func (st *HelmState) flagsForDiff(helm helmexec.Interface, release *ReleaseSpec,
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if helm.IsHelm3() && helm.GetPostRenderer() == "" {
|
||||||
|
if release.PostRenderer != nil && *release.PostRenderer != "" {
|
||||||
|
flags = append(flags, "--post-renderer", *release.PostRenderer)
|
||||||
|
} else if st.HelmDefaults.PostRenderer != nil && *st.HelmDefaults.PostRenderer != "" {
|
||||||
|
flags = append(flags, "--post-renderer", *st.HelmDefaults.PostRenderer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
common, files, err := st.namespaceAndValuesFlags(helm, release, workerIndex)
|
common, files, err := st.namespaceAndValuesFlags(helm, release, workerIndex)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, files, err
|
return nil, files, err
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue