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

fix more issue 

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2025-04-07 11:13:47 +08:00 committed by yxxhero
parent 6e6b479473
commit d933f95110
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/app/app_template_test.go
View File

@ -414,7 +414,7 @@ releases:
t.Run("fail due to unknown field with goccy/go-yaml", func(t *testing.T) { t.Run("fail due to unknown field with goccy/go-yaml", func(t *testing.T) {
check(t, testcase{ check(t, testcase{
goccyGoYaml: true, goccyGoYaml: true,
error: `in ./helmfile.yaml: failed to read helmfile.yaml: reading document at index 1, you should add .gotmpl extension to your helmfile to enable helmfile to load it as a template since helmfile v1: [4:3] unknown field "foobar" error: `in ./helmfile.yaml: failed to read helmfile.yaml: reading document at index 1. Started seeing this since Helmfile v1? Add the .gotmpl file extension: [4:3] unknown field "foobar"
2 | releases: 2 | releases:
3 | - name: app1 3 | - name: app1
> 4 | foobar: FOOBAR > 4 | foobar: FOOBAR
@ -426,7 +426,7 @@ releases:
t.Run("fail due to unknown field with gopkg.in/yaml.v2", func(t *testing.T) { t.Run("fail due to unknown field with gopkg.in/yaml.v2", func(t *testing.T) {
check(t, testcase{ check(t, testcase{
goccyGoYaml: false, goccyGoYaml: false,
error: `in ./helmfile.yaml: failed to read helmfile.yaml: reading document at index 1, you should add .gotmpl extension to your helmfile to enable helmfile to load it as a template since helmfile v1: yaml: unmarshal errors: error: `in ./helmfile.yaml: failed to read helmfile.yaml: reading document at index 1. Started seeing this since Helmfile v1? Add the .gotmpl file extension: yaml: unmarshal errors:
line 4: field foobar not found in type state.ReleaseSpec`, line 4: field foobar not found in type state.ReleaseSpec`,
}) })
}) })

6
pkg/state/create.go
View File

@ -4,6 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"path/filepath"
"slices" "slices"
"strings" "strings"
@ -109,7 +110,10 @@ func (c *StateCreator) Parse(content []byte, baseDir, file string) (*HelmState,
if err == io.EOF { if err == io.EOF {
break break
} else if err != nil { } else if err != nil {
return nil, &StateLoadError{fmt.Sprintf("failed to read %s: reading document at index %d, you should add .gotmpl extension to your helmfile to enable helmfile to load it as a template since helmfile v1", file, i), err} if filepath.Ext(file) != ".gotmpl" {
return nil, &StateLoadError{fmt.Sprintf("failed to read %s: reading document at index %d. Started seeing this since Helmfile v1? Add the .gotmpl file extension", file, i), err}
}
return nil, &StateLoadError{fmt.Sprintf("failed to read %s: reading document at index %d", file, i), err}
} }
if err := mergo.Merge(&state, &intermediate, mergo.WithAppendSlice); err != nil { if err := mergo.Merge(&state, &intermediate, mergo.WithAppendSlice); err != nil {