From c678c0c9c088fc2f9ddbad8c88416c77f4e048cc Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Thu, 28 May 2026 05:12:27 -0600 Subject: [PATCH 1/3] chore: bump go to 1.26 Signed-off-by: Terry Howe --- .github/env | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/env b/.github/env index 9d79b174f..04b4c2723 100644 --- a/.github/env +++ b/.github/env @@ -1,2 +1,2 @@ -GOLANG_VERSION=1.25 +GOLANG_VERSION=1.26 GOLANGCI_LINT_VERSION=v2.5.0 diff --git a/go.mod b/go.mod index da53bf246..bf14f99b4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module helm.sh/helm/v3 -go 1.25.0 +go 1.26.0 require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 From 0ed92f0696329495d87f8acdc42687c30b31d431 Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Thu, 28 May 2026 05:22:07 -0600 Subject: [PATCH 2/3] ci: bump golangci-lint to v2.11.3 for go 1.26 golangci-lint v2.5.0 is built with go1.25 and refuses to lint a module targeting go 1.26.0. Bump to v2.11.3 (matching main) and apply the new staticcheck QF1012 fixes it surfaces in jsonschema.go. Signed-off-by: Terry Howe --- .github/env | 2 +- pkg/chartutil/jsonschema.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/env b/.github/env index 04b4c2723..43ebdd36e 100644 --- a/.github/env +++ b/.github/env @@ -1,2 +1,2 @@ GOLANG_VERSION=1.26 -GOLANGCI_LINT_VERSION=v2.5.0 +GOLANGCI_LINT_VERSION=v2.11.3 diff --git a/pkg/chartutil/jsonschema.go b/pkg/chartutil/jsonschema.go index 632e6dfd1..3718cf37a 100644 --- a/pkg/chartutil/jsonschema.go +++ b/pkg/chartutil/jsonschema.go @@ -78,7 +78,7 @@ func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) err err := ValidateAgainstSingleSchema(values, chrt.Schema) if err != nil { - sb.WriteString(fmt.Sprintf("%s:\n", chrt.Name())) + fmt.Fprintf(&sb, "%s:\n", chrt.Name()) sb.WriteString(err.Error()) } } @@ -92,10 +92,10 @@ func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) err subchartValues, ok := raw.(map[string]any) if !ok { - sb.WriteString(fmt.Sprintf( + fmt.Fprintf(&sb, "%s:\ninvalid type for values: expected object (map), got %T\n", subchart.Name(), raw, - )) + ) continue } if err := ValidateAgainstSchema(subchart, subchartValues); err != nil { From ceb9a62ec03c8d5aea94dee9c9456a7dfd89ba71 Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Thu, 28 May 2026 07:48:22 -0600 Subject: [PATCH 3/3] Update .github/env Co-authored-by: Matthieu MOREL Signed-off-by: Terry Howe --- .github/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/env b/.github/env index 43ebdd36e..9a0c1ef4c 100644 --- a/.github/env +++ b/.github/env @@ -1,2 +1,2 @@ GOLANG_VERSION=1.26 -GOLANGCI_LINT_VERSION=v2.11.3 +GOLANGCI_LINT_VERSION=v2.12.2