mirror of
https://github.com/helm/helm.git
synced 2026-05-28 04:35:48 -04:00
fixing matts changes
Signed-off-by: Robert Sirchia <rsirchia@outlook.com>
This commit is contained in:
parent
3a19576377
commit
c5991028e0
3 changed files with 5 additions and 5 deletions
|
|
@ -254,7 +254,7 @@ func processImportValues(c *chart.Chart, merge bool) error {
|
|||
// get child table
|
||||
vv, err := cvals.Table(r.Name + "." + child)
|
||||
if err != nil {
|
||||
slog.Warn("ImportValues missing table from chart", "chart", r.Name, "value", err)
|
||||
slog.Warn("ImportValues missing table from chart", "chart", r.Name, "error", err)
|
||||
continue
|
||||
}
|
||||
// create value map from child to be merged into parent
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ func (e Engine) initFunMap(t *template.Template) {
|
|||
if val == nil {
|
||||
if e.LintMode {
|
||||
// Don't fail on missing required values when linting
|
||||
slog.Warn("missing required value", "value", warn)
|
||||
slog.Warn("missing required value", "message", warn)
|
||||
return "", nil
|
||||
}
|
||||
return val, errors.New(warnWrap(warn))
|
||||
|
|
@ -211,7 +211,7 @@ func (e Engine) initFunMap(t *template.Template) {
|
|||
if val == "" {
|
||||
if e.LintMode {
|
||||
// Don't fail on missing required values when linting
|
||||
slog.Warn("missing required values", "value", warn)
|
||||
slog.Warn("missing required values", "message", warn)
|
||||
return "", nil
|
||||
}
|
||||
return val, errors.New(warnWrap(warn))
|
||||
|
|
@ -224,7 +224,7 @@ func (e Engine) initFunMap(t *template.Template) {
|
|||
funcMap["fail"] = func(msg string) (string, error) {
|
||||
if e.LintMode {
|
||||
// Don't fail when linting
|
||||
slog.Info("funcMap fail", "lintMode", msg)
|
||||
slog.Info("funcMap fail", "message", msg)
|
||||
return "", nil
|
||||
}
|
||||
return "", errors.New(warnWrap(msg))
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ func getAPIResourceForGVK(gvk schema.GroupVersionKind, config *rest.Config) (met
|
|||
}
|
||||
resList, err := discoveryClient.ServerResourcesForGroupVersion(gvk.GroupVersion().String())
|
||||
if err != nil {
|
||||
slog.Error("unable to retrieve resource list", "list", gvk.GroupVersion().String(), "error", err)
|
||||
slog.Error("unable to retrieve resource list", "GroupVersion", gvk.GroupVersion().String(), "error", err)
|
||||
return res, err
|
||||
}
|
||||
for _, resource := range resList.APIResources {
|
||||
|
|
|
|||
Loading…
Reference in a new issue