msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

fixing matts changes

Browse Source 
Signed-off-by: Robert Sirchia <rsirchia@outlook.com>
pull/30603/head
Robert Sirchia 6 months ago
parent 3a19576377
commit c5991028e0
No known key found for this signature in database
GPG Key ID: C2D40F4D8196E874
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

2
pkg/chart/v2/util/dependencies.go
Unescape View File

@ -254,7 +254,7 @@ func processImportValues(c *chart.Chart, merge bool) error {
// get child table // get child table
vv, err := cvals.Table(r.Name + "." + child) vv, err := cvals.Table(r.Name + "." + child)
if err != nil { 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 continue
} }
// create value map from child to be merged into parent // create value map from child to be merged into parent

6
pkg/engine/engine.go
Unescape View File

@ -203,7 +203,7 @@ func (e Engine) initFunMap(t *template.Template) {
if val == nil { if val == nil {
if e.LintMode { if e.LintMode {
// Don't fail on missing required values when linting // 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 "", nil
} }
return val, errors.New(warnWrap(warn)) return val, errors.New(warnWrap(warn))
@ -211,7 +211,7 @@ func (e Engine) initFunMap(t *template.Template) {
if val == "" { if val == "" {
if e.LintMode { if e.LintMode {
// Don't fail on missing required values when linting // 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 "", nil
} }
return val, errors.New(warnWrap(warn)) return val, errors.New(warnWrap(warn))
@ -224,7 +224,7 @@ func (e Engine) initFunMap(t *template.Template) {
funcMap["fail"] = func(msg string) (string, error) { funcMap["fail"] = func(msg string) (string, error) {
if e.LintMode { if e.LintMode {
// Don't fail when linting // Don't fail when linting
slog.Info("funcMap fail", "lintMode", msg) slog.Info("funcMap fail", "message", msg)
return "", nil return "", nil
} }
return "", errors.New(warnWrap(msg)) return "", errors.New(warnWrap(msg))

2
pkg/engine/lookup_func.go
Unescape View File

@ -127,7 +127,7 @@ func getAPIResourceForGVK(gvk schema.GroupVersionKind, config *rest.Config) (met
} }
resList, err := discoveryClient.ServerResourcesForGroupVersion(gvk.GroupVersion().String()) resList, err := discoveryClient.ServerResourcesForGroupVersion(gvk.GroupVersion().String())
if err != nil { 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 return res, err
} }
for _, resource := range resList.APIResources { for _, resource := range resList.APIResources {

Write Preview
Loading…
Cancel
Save