From 8eb136f67e6f2640fd5eb928e13d7757be3273de Mon Sep 17 00:00:00 2001 From: koba1t Date: Thu, 12 Feb 2026 01:23:18 +0900 Subject: [PATCH] update go 1.25.7 --- .golangci.yml | 2 +- api/go.mod | 2 +- cmd/config/docs/api-conventions/functions-impl.md | 2 +- cmd/config/go.mod | 2 +- .../internal/commands/e2e/e2econtainerconfig/Dockerfile | 2 +- cmd/config/internal/commands/e2e/e2econtainerconfig/go.mod | 2 +- .../internal/commands/e2e/e2econtainerenvgenerator/Dockerfile | 2 +- .../internal/commands/e2e/e2econtainerenvgenerator/go.mod | 2 +- .../internal/commands/e2e/e2econtainermountbind/Dockerfile | 2 +- cmd/config/internal/commands/e2e/e2econtainermountbind/go.mod | 2 +- .../commands/e2e/e2econtainersimplegenerator/Dockerfile | 2 +- .../internal/commands/e2e/e2econtainersimplegenerator/go.mod | 2 +- cmd/config/internal/generateddocs/api/docs.go | 2 +- cmd/depprobcheck/go.mod | 2 +- cmd/gorepomod/go.mod | 2 +- cmd/k8scopy/go.mod | 2 +- cmd/mdtogo/go.mod | 2 +- cmd/pluginator/go.mod | 2 +- cmd/pluginator/internal/krmfunction/converter.go | 2 +- cmd/pluginator/internal/krmfunction/funcwrappersrc/go.mod.src | 2 +- functions/examples/application-cr/image/Dockerfile | 2 +- functions/examples/application-cr/image/go.mod | 2 +- functions/examples/fn-framework-application/go.mod | 2 +- functions/examples/injection-tshirt-sizes/image/Dockerfile | 2 +- functions/examples/injection-tshirt-sizes/image/go.mod | 2 +- functions/examples/template-go-nginx/image/Dockerfile | 2 +- functions/examples/template-go-nginx/image/go.mod | 2 +- functions/examples/validator-kubeval/image/Dockerfile | 2 +- functions/examples/validator-kubeval/image/go.mod | 2 +- .../examples/validator-resource-requests/image/Dockerfile | 2 +- functions/examples/validator-resource-requests/image/go.mod | 2 +- go.work | 3 ++- hack/go.mod | 2 +- kustomize.Dockerfile | 2 +- kustomize/go.mod | 3 ++- kyaml/fn/framework/command/command.go | 2 +- kyaml/fn/framework/command/command_test.go | 2 +- kyaml/fn/framework/example/Dockerfile | 2 +- kyaml/go.mod | 2 +- plugin/builtin/annotationstransformer/go.mod | 2 +- plugin/builtin/configmapgenerator/go.mod | 2 +- plugin/builtin/hashtransformer/go.mod | 2 +- plugin/builtin/helmchartinflationgenerator/go.mod | 2 +- plugin/builtin/iampolicygenerator/go.mod | 2 +- plugin/builtin/imagetagtransformer/go.mod | 2 +- plugin/builtin/labeltransformer/go.mod | 2 +- plugin/builtin/namespacetransformer/go.mod | 2 +- plugin/builtin/patchjson6902transformer/go.mod | 2 +- plugin/builtin/patchstrategicmergetransformer/go.mod | 2 +- plugin/builtin/patchtransformer/go.mod | 2 +- plugin/builtin/prefixtransformer/go.mod | 2 +- plugin/builtin/replacementtransformer/go.mod | 2 +- plugin/builtin/replicacounttransformer/go.mod | 2 +- plugin/builtin/secretgenerator/go.mod | 2 +- plugin/builtin/sortordertransformer/go.mod | 2 +- plugin/builtin/suffixtransformer/go.mod | 2 +- plugin/builtin/valueaddtransformer/go.mod | 2 +- plugin/someteam.example.com/v1/bashedconfigmap/go.mod | 2 +- plugin/someteam.example.com/v1/calvinduplicator/go.mod | 2 +- plugin/someteam.example.com/v1/dateprefixer/go.mod | 2 +- plugin/someteam.example.com/v1/printpluginenv/go.mod | 2 +- plugin/someteam.example.com/v1/secretsfromdatabase/go.mod | 2 +- plugin/someteam.example.com/v1/sedtransformer/go.mod | 2 +- plugin/someteam.example.com/v1/someservicegenerator/go.mod | 2 +- plugin/someteam.example.com/v1/stringprefixer/go.mod | 2 +- plugin/someteam.example.com/v1/validator/go.mod | 2 +- plugin/untested/v1/gogetter/go.mod | 2 +- site/Dockerfile | 4 ++-- 68 files changed, 71 insertions(+), 69 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 03fcc5a5b..279d6c1e5 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,7 +3,7 @@ run: deadline: 5m - go: "1.24" + go: "1.25" linters: enable-all: true diff --git a/api/go.mod b/api/go.mod index 5c3860891..f59b1a125 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/api -go 1.24.0 +go 1.25 require ( github.com/blang/semver/v4 v4.0.0 diff --git a/cmd/config/docs/api-conventions/functions-impl.md b/cmd/config/docs/api-conventions/functions-impl.md index b62c63f7d..dfccf0f2b 100644 --- a/cmd/config/docs/api-conventions/functions-impl.md +++ b/cmd/config/docs/api-conventions/functions-impl.md @@ -90,7 +90,7 @@ End-of-message image. ``` -FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye +FROM public.ecr.aws/docker/library/golang:1.25.7 RUN go get sigs.k8s.io/kustomize/cmd/config RUN mv /go/bin/config /usr/bin/config COPY nginx-template.sh /usr/bin/nginx-template.sh diff --git a/cmd/config/go.mod b/cmd/config/go.mod index dd12a8df5..e45d26db6 100644 --- a/cmd/config/go.mod +++ b/cmd/config/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/config -go 1.24.0 +go 1.25 require ( github.com/go-errors/errors v1.4.2 diff --git a/cmd/config/internal/commands/e2e/e2econtainerconfig/Dockerfile b/cmd/config/internal/commands/e2e/e2econtainerconfig/Dockerfile index d994ecfaf..ee46e97ed 100644 --- a/cmd/config/internal/commands/e2e/e2econtainerconfig/Dockerfile +++ b/cmd/config/internal/commands/e2e/e2econtainerconfig/Dockerfile @@ -1,7 +1,7 @@ # Copyright 2019 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye +FROM public.ecr.aws/docker/library/golang:1.25.7 ENV CGO_ENABLED=0 WORKDIR /go/src/ diff --git a/cmd/config/internal/commands/e2e/e2econtainerconfig/go.mod b/cmd/config/internal/commands/e2e/e2econtainerconfig/go.mod index a0d3c45d0..a3d045ae7 100644 --- a/cmd/config/internal/commands/e2e/e2econtainerconfig/go.mod +++ b/cmd/config/internal/commands/e2e/e2econtainerconfig/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/config/internal/commands/e2e/e2econtainerconfig -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/kyaml v0.14.2 diff --git a/cmd/config/internal/commands/e2e/e2econtainerenvgenerator/Dockerfile b/cmd/config/internal/commands/e2e/e2econtainerenvgenerator/Dockerfile index 50c846fe3..38eb0dd03 100644 --- a/cmd/config/internal/commands/e2e/e2econtainerenvgenerator/Dockerfile +++ b/cmd/config/internal/commands/e2e/e2econtainerenvgenerator/Dockerfile @@ -1,7 +1,7 @@ # Copyright 2019 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye +FROM public.ecr.aws/docker/library/golang:1.25.7 ENV CGO_ENABLED=0 WORKDIR /go/src/ diff --git a/cmd/config/internal/commands/e2e/e2econtainerenvgenerator/go.mod b/cmd/config/internal/commands/e2e/e2econtainerenvgenerator/go.mod index 24d0d8a25..a0a6601f0 100644 --- a/cmd/config/internal/commands/e2e/e2econtainerenvgenerator/go.mod +++ b/cmd/config/internal/commands/e2e/e2econtainerenvgenerator/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/config/internal/commands/e2e/e2econtainerenvgenerator -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/kyaml v0.14.2 diff --git a/cmd/config/internal/commands/e2e/e2econtainermountbind/Dockerfile b/cmd/config/internal/commands/e2e/e2econtainermountbind/Dockerfile index 17b5048e1..084865a4f 100644 --- a/cmd/config/internal/commands/e2e/e2econtainermountbind/Dockerfile +++ b/cmd/config/internal/commands/e2e/e2econtainermountbind/Dockerfile @@ -1,7 +1,7 @@ # Copyright 2019 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye +FROM public.ecr.aws/docker/library/golang:1.25.7 ENV CGO_ENABLED=0 WORKDIR /go/src/ diff --git a/cmd/config/internal/commands/e2e/e2econtainermountbind/go.mod b/cmd/config/internal/commands/e2e/e2econtainermountbind/go.mod index f05b18f39..d965871e6 100644 --- a/cmd/config/internal/commands/e2e/e2econtainermountbind/go.mod +++ b/cmd/config/internal/commands/e2e/e2econtainermountbind/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/config/internal/commands/e2e/e2econtainer-render-helm-chart -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/kyaml v0.14.2 diff --git a/cmd/config/internal/commands/e2e/e2econtainersimplegenerator/Dockerfile b/cmd/config/internal/commands/e2e/e2econtainersimplegenerator/Dockerfile index a9ccd7abc..a16f5c32d 100644 --- a/cmd/config/internal/commands/e2e/e2econtainersimplegenerator/Dockerfile +++ b/cmd/config/internal/commands/e2e/e2econtainersimplegenerator/Dockerfile @@ -1,7 +1,7 @@ # Copyright 2019 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye +FROM public.ecr.aws/docker/library/golang:1.25.7 ENV CGO_ENABLED=0 WORKDIR /go/src/ diff --git a/cmd/config/internal/commands/e2e/e2econtainersimplegenerator/go.mod b/cmd/config/internal/commands/e2e/e2econtainersimplegenerator/go.mod index 3d9eca82f..dc3e40bae 100644 --- a/cmd/config/internal/commands/e2e/e2econtainersimplegenerator/go.mod +++ b/cmd/config/internal/commands/e2e/e2econtainersimplegenerator/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/config/internal/commands/e2e/e2econtainersimplegenerator -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/kyaml v0.14.2 diff --git a/cmd/config/internal/generateddocs/api/docs.go b/cmd/config/internal/generateddocs/api/docs.go index d6c005be4..665f44180 100644 --- a/cmd/config/internal/generateddocs/api/docs.go +++ b/cmd/config/internal/generateddocs/api/docs.go @@ -144,7 +144,7 @@ The script wraps itself using ` + "`" + `config run wrap -- $0` + "`" + ` which ` + "`" + `Dockerfile` + "`" + ` installs ` + "`" + `kustomize fn` + "`" + ` and copies the script into the container image. - FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye + FROM public.ecr.aws/docker/library/golang:1.25.7 RUN go get sigs.k8s.io/kustomize/cmd/config RUN mv /go/bin/config /usr/bin/config COPY nginx-template.sh /usr/bin/nginx-template.sh diff --git a/cmd/depprobcheck/go.mod b/cmd/depprobcheck/go.mod index f4a02454b..b205c823c 100644 --- a/cmd/depprobcheck/go.mod +++ b/cmd/depprobcheck/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/depprobcheck -go 1.24.0 +go 1.25 require ( k8s.io/cli-runtime v0.20.4 diff --git a/cmd/gorepomod/go.mod b/cmd/gorepomod/go.mod index 8ab234ac4..a20794057 100644 --- a/cmd/gorepomod/go.mod +++ b/cmd/gorepomod/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/gorepomod -go 1.24.0 +go 1.25 tool sigs.k8s.io/kustomize/cmd/gorepomod diff --git a/cmd/k8scopy/go.mod b/cmd/k8scopy/go.mod index c56db3fca..879a0f055 100644 --- a/cmd/k8scopy/go.mod +++ b/cmd/k8scopy/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/k8scopy -go 1.24.0 +go 1.25 tool sigs.k8s.io/kustomize/cmd/k8scopy diff --git a/cmd/mdtogo/go.mod b/cmd/mdtogo/go.mod index bea529240..c0b81a35f 100644 --- a/cmd/mdtogo/go.mod +++ b/cmd/mdtogo/go.mod @@ -1,5 +1,5 @@ module sigs.k8s.io/kustomize/cmd/mdtogo -go 1.24.0 +go 1.25 tool sigs.k8s.io/kustomize/cmd/mdtogo diff --git a/cmd/pluginator/go.mod b/cmd/pluginator/go.mod index 39b63935e..99926a294 100644 --- a/cmd/pluginator/go.mod +++ b/cmd/pluginator/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/pluginator/v2 -go 1.24.0 +go 1.25 tool sigs.k8s.io/kustomize/cmd/pluginator/v2 diff --git a/cmd/pluginator/internal/krmfunction/converter.go b/cmd/pluginator/internal/krmfunction/converter.go index 4fd531156..54c8e606c 100644 --- a/cmd/pluginator/internal/krmfunction/converter.go +++ b/cmd/pluginator/internal/krmfunction/converter.go @@ -86,7 +86,7 @@ func (c *Converter) Convert() error { } func (c *Converter) getDockerfile() string { - return `FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye + return `FROM public.ecr.aws/docker/library/golang:1.25.7 ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY . . diff --git a/cmd/pluginator/internal/krmfunction/funcwrappersrc/go.mod.src b/cmd/pluginator/internal/krmfunction/funcwrappersrc/go.mod.src index c7264ff87..507c9dcc1 100644 --- a/cmd/pluginator/internal/krmfunction/funcwrappersrc/go.mod.src +++ b/cmd/pluginator/internal/krmfunction/funcwrappersrc/go.mod.src @@ -1,6 +1,6 @@ module main -go 1.24.0 +go 1.25 require ( github.com/spf13/cobra v1.4.0 diff --git a/functions/examples/application-cr/image/Dockerfile b/functions/examples/application-cr/image/Dockerfile index 405fa7855..3dd6d4430 100644 --- a/functions/examples/application-cr/image/Dockerfile +++ b/functions/examples/application-cr/image/Dockerfile @@ -1,7 +1,7 @@ # Copyright 2019 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye +FROM public.ecr.aws/docker/library/golang:1.25.7 ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY go.mod . diff --git a/functions/examples/application-cr/image/go.mod b/functions/examples/application-cr/image/go.mod index 1a23d6dbd..04a0eb90f 100644 --- a/functions/examples/application-cr/image/go.mod +++ b/functions/examples/application-cr/image/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/functions/examples/application-cr -go 1.24.0 +go 1.25 require ( k8s.io/apimachinery v0.29.0 diff --git a/functions/examples/fn-framework-application/go.mod b/functions/examples/fn-framework-application/go.mod index 540ff36f3..2cf41432c 100644 --- a/functions/examples/fn-framework-application/go.mod +++ b/functions/examples/fn-framework-application/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/functions/examples/fn-framework-application -go 1.24.0 +go 1.25 require ( github.com/spf13/cobra v1.9.1 diff --git a/functions/examples/injection-tshirt-sizes/image/Dockerfile b/functions/examples/injection-tshirt-sizes/image/Dockerfile index 405fa7855..3dd6d4430 100644 --- a/functions/examples/injection-tshirt-sizes/image/Dockerfile +++ b/functions/examples/injection-tshirt-sizes/image/Dockerfile @@ -1,7 +1,7 @@ # Copyright 2019 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye +FROM public.ecr.aws/docker/library/golang:1.25.7 ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY go.mod . diff --git a/functions/examples/injection-tshirt-sizes/image/go.mod b/functions/examples/injection-tshirt-sizes/image/go.mod index 4a61cdbb8..24500073e 100644 --- a/functions/examples/injection-tshirt-sizes/image/go.mod +++ b/functions/examples/injection-tshirt-sizes/image/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/functions/examples/injection-tshirt-sizes -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/kyaml v0.13.7 diff --git a/functions/examples/template-go-nginx/image/Dockerfile b/functions/examples/template-go-nginx/image/Dockerfile index 405fa7855..3dd6d4430 100644 --- a/functions/examples/template-go-nginx/image/Dockerfile +++ b/functions/examples/template-go-nginx/image/Dockerfile @@ -1,7 +1,7 @@ # Copyright 2019 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye +FROM public.ecr.aws/docker/library/golang:1.25.7 ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY go.mod . diff --git a/functions/examples/template-go-nginx/image/go.mod b/functions/examples/template-go-nginx/image/go.mod index 7f8bc15a4..061034d1b 100644 --- a/functions/examples/template-go-nginx/image/go.mod +++ b/functions/examples/template-go-nginx/image/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/functions/examples/template-go-nginx -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/kyaml v0.13.7 diff --git a/functions/examples/validator-kubeval/image/Dockerfile b/functions/examples/validator-kubeval/image/Dockerfile index 6e011071f..ae2dab54e 100644 --- a/functions/examples/validator-kubeval/image/Dockerfile +++ b/functions/examples/validator-kubeval/image/Dockerfile @@ -5,7 +5,7 @@ FROM alpine:latest as schemas RUN apk --no-cache add git RUN git clone --depth 1 https://github.com/instrumenta/kubernetes-json-schema.git -FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye as function +FROM public.ecr.aws/docker/library/golang:1.25.7 as function ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY go.mod . diff --git a/functions/examples/validator-kubeval/image/go.mod b/functions/examples/validator-kubeval/image/go.mod index 5c94536e7..f273c7413 100644 --- a/functions/examples/validator-kubeval/image/go.mod +++ b/functions/examples/validator-kubeval/image/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/functions/examples/validator-kubeval -go 1.24.0 +go 1.25 require ( github.com/instrumenta/kubeval v0.16.1 diff --git a/functions/examples/validator-resource-requests/image/Dockerfile b/functions/examples/validator-resource-requests/image/Dockerfile index 405fa7855..3dd6d4430 100644 --- a/functions/examples/validator-resource-requests/image/Dockerfile +++ b/functions/examples/validator-resource-requests/image/Dockerfile @@ -1,7 +1,7 @@ # Copyright 2019 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye +FROM public.ecr.aws/docker/library/golang:1.25.7 ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY go.mod . diff --git a/functions/examples/validator-resource-requests/image/go.mod b/functions/examples/validator-resource-requests/image/go.mod index eadeb267d..34d06dcc7 100644 --- a/functions/examples/validator-resource-requests/image/go.mod +++ b/functions/examples/validator-resource-requests/image/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/functions/examples/validator-resource-requests -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/kyaml v0.13.7 diff --git a/go.work b/go.work index 58bba1c79..61ebccf1c 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,5 @@ -go 1.24.0 +// Omit the patch version to avoid an extra bump in downstream projects. +go 1.25 use ( ./api diff --git a/hack/go.mod b/hack/go.mod index bd989844f..32e0e85d5 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/hack -go 1.24.0 +go 1.25 tool ( // for embeding code and manifest into markdown docs diff --git a/kustomize.Dockerfile b/kustomize.Dockerfile index 51509fd85..9c4f3c0dc 100644 --- a/kustomize.Dockerfile +++ b/kustomize.Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # build -FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye AS builder +FROM public.ecr.aws/docker/library/golang:1.25.7 AS builder ARG VERSION ARG DATE RUN mkdir /build diff --git a/kustomize/go.mod b/kustomize/go.mod index f35dbc647..22f36e8ce 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -1,6 +1,7 @@ module sigs.k8s.io/kustomize/kustomize/v5 -go 1.24.0 +// Omit the patch version to avoid an extra bump in downstream projects. +go 1.25 require ( github.com/google/go-cmp v0.7.0 diff --git a/kyaml/fn/framework/command/command.go b/kyaml/fn/framework/command/command.go index 79135b079..d2d507d1d 100644 --- a/kyaml/fn/framework/command/command.go +++ b/kyaml/fn/framework/command/command.go @@ -121,7 +121,7 @@ func AddGenerateDockerfile(cmd *cobra.Command) { Use: "gen [DIR]", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - if err := os.WriteFile(filepath.Join(args[0], "Dockerfile"), []byte(`FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye as builder + if err := os.WriteFile(filepath.Join(args[0], "Dockerfile"), []byte(`FROM public.ecr.aws/docker/library/golang:1.25.7 as builder ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY go.mod go.sum ./ diff --git a/kyaml/fn/framework/command/command_test.go b/kyaml/fn/framework/command/command_test.go index 5722c412f..5ca787a3d 100644 --- a/kyaml/fn/framework/command/command_test.go +++ b/kyaml/fn/framework/command/command_test.go @@ -41,7 +41,7 @@ func TestCommand_dockerfile(t *testing.T) { t.FailNow() } - expected := `FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye as builder + expected := `FROM public.ecr.aws/docker/library/golang:1.25.7 as builder ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY go.mod go.sum ./ diff --git a/kyaml/fn/framework/example/Dockerfile b/kyaml/fn/framework/example/Dockerfile index 190735ad3..7f33e7641 100644 --- a/kyaml/fn/framework/example/Dockerfile +++ b/kyaml/fn/framework/example/Dockerfile @@ -1,7 +1,7 @@ # Copyright 2019 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -FROM public.ecr.aws/docker/library/golang:1.24.6-bullseye +FROM public.ecr.aws/docker/library/golang:1.25.7 ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY . . diff --git a/kyaml/go.mod b/kyaml/go.mod index d694241d9..24fa2f5cc 100644 --- a/kyaml/go.mod +++ b/kyaml/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/kyaml -go 1.24.0 +go 1.25 require ( github.com/davecgh/go-spew v1.1.1 diff --git a/plugin/builtin/annotationstransformer/go.mod b/plugin/builtin/annotationstransformer/go.mod index 1f236e5c4..fbd8ee223 100644 --- a/plugin/builtin/annotationstransformer/go.mod +++ b/plugin/builtin/annotationstransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/annotationstransformer -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/builtin/configmapgenerator/go.mod b/plugin/builtin/configmapgenerator/go.mod index 15d2611d6..b89dc4560 100644 --- a/plugin/builtin/configmapgenerator/go.mod +++ b/plugin/builtin/configmapgenerator/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/configmapgenerator -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/builtin/hashtransformer/go.mod b/plugin/builtin/hashtransformer/go.mod index 931b63ada..7c948bc32 100644 --- a/plugin/builtin/hashtransformer/go.mod +++ b/plugin/builtin/hashtransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/hashtransformer -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/builtin/helmchartinflationgenerator/go.mod b/plugin/builtin/helmchartinflationgenerator/go.mod index 32d1225ad..25430f74f 100644 --- a/plugin/builtin/helmchartinflationgenerator/go.mod +++ b/plugin/builtin/helmchartinflationgenerator/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/helmchartinflationgenerator -go 1.24.0 +go 1.25 require ( github.com/stretchr/testify v1.10.0 diff --git a/plugin/builtin/iampolicygenerator/go.mod b/plugin/builtin/iampolicygenerator/go.mod index 2bb31cfc8..19a592e58 100644 --- a/plugin/builtin/iampolicygenerator/go.mod +++ b/plugin/builtin/iampolicygenerator/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/iampolicygenerator -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/builtin/imagetagtransformer/go.mod b/plugin/builtin/imagetagtransformer/go.mod index 7135ab90d..03cd86859 100644 --- a/plugin/builtin/imagetagtransformer/go.mod +++ b/plugin/builtin/imagetagtransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/imagetagtransformer -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/builtin/labeltransformer/go.mod b/plugin/builtin/labeltransformer/go.mod index 02a21b1f1..de30581d0 100644 --- a/plugin/builtin/labeltransformer/go.mod +++ b/plugin/builtin/labeltransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/labeltransformer -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/builtin/namespacetransformer/go.mod b/plugin/builtin/namespacetransformer/go.mod index 0dee114c3..6de4a3be0 100644 --- a/plugin/builtin/namespacetransformer/go.mod +++ b/plugin/builtin/namespacetransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/namespacetransformer -go 1.24.0 +go 1.25 require ( github.com/stretchr/testify v1.10.0 diff --git a/plugin/builtin/patchjson6902transformer/go.mod b/plugin/builtin/patchjson6902transformer/go.mod index 476229694..7da048095 100644 --- a/plugin/builtin/patchjson6902transformer/go.mod +++ b/plugin/builtin/patchjson6902transformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/patchjson6902transformer -go 1.24.0 +go 1.25 require ( gopkg.in/evanphx/json-patch.v4 v4.13.0 diff --git a/plugin/builtin/patchstrategicmergetransformer/go.mod b/plugin/builtin/patchstrategicmergetransformer/go.mod index 484a38196..bd30a61bf 100644 --- a/plugin/builtin/patchstrategicmergetransformer/go.mod +++ b/plugin/builtin/patchstrategicmergetransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/patchstrategicmergetransformer -go 1.24.0 +go 1.25 require ( github.com/stretchr/testify v1.10.0 diff --git a/plugin/builtin/patchtransformer/go.mod b/plugin/builtin/patchtransformer/go.mod index dc1fdf5c8..9e1e7c9db 100644 --- a/plugin/builtin/patchtransformer/go.mod +++ b/plugin/builtin/patchtransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/patchtransformer -go 1.24.0 +go 1.25 require ( github.com/stretchr/testify v1.10.0 diff --git a/plugin/builtin/prefixtransformer/go.mod b/plugin/builtin/prefixtransformer/go.mod index 9387a8b36..511c4364c 100644 --- a/plugin/builtin/prefixtransformer/go.mod +++ b/plugin/builtin/prefixtransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/prefixtransformer -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/builtin/replacementtransformer/go.mod b/plugin/builtin/replacementtransformer/go.mod index 214151a1a..302b5443f 100644 --- a/plugin/builtin/replacementtransformer/go.mod +++ b/plugin/builtin/replacementtransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/replacementtransformer -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/builtin/replicacounttransformer/go.mod b/plugin/builtin/replicacounttransformer/go.mod index f4d5eb0b7..cb6f6c1d5 100644 --- a/plugin/builtin/replicacounttransformer/go.mod +++ b/plugin/builtin/replicacounttransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/replicacounttransformer -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/builtin/secretgenerator/go.mod b/plugin/builtin/secretgenerator/go.mod index b305a6cd7..d3dd43f15 100644 --- a/plugin/builtin/secretgenerator/go.mod +++ b/plugin/builtin/secretgenerator/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/secretgenerator -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/builtin/sortordertransformer/go.mod b/plugin/builtin/sortordertransformer/go.mod index d61cc054b..eff393aaa 100644 --- a/plugin/builtin/sortordertransformer/go.mod +++ b/plugin/builtin/sortordertransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/sortordertransformer -go 1.24.0 +go 1.25 require ( github.com/stretchr/testify v1.10.0 diff --git a/plugin/builtin/suffixtransformer/go.mod b/plugin/builtin/suffixtransformer/go.mod index d3cb69a0b..2d6991223 100644 --- a/plugin/builtin/suffixtransformer/go.mod +++ b/plugin/builtin/suffixtransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/suffixtransformer -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/builtin/valueaddtransformer/go.mod b/plugin/builtin/valueaddtransformer/go.mod index 38b93ab8e..c8f67e575 100644 --- a/plugin/builtin/valueaddtransformer/go.mod +++ b/plugin/builtin/valueaddtransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/valueaddtransformer -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/someteam.example.com/v1/bashedconfigmap/go.mod b/plugin/someteam.example.com/v1/bashedconfigmap/go.mod index 905818344..146767d8c 100644 --- a/plugin/someteam.example.com/v1/bashedconfigmap/go.mod +++ b/plugin/someteam.example.com/v1/bashedconfigmap/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/bashedconfigmap -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/someteam.example.com/v1/calvinduplicator/go.mod b/plugin/someteam.example.com/v1/calvinduplicator/go.mod index 2e4732ce9..12447f305 100644 --- a/plugin/someteam.example.com/v1/calvinduplicator/go.mod +++ b/plugin/someteam.example.com/v1/calvinduplicator/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/calvinduplicator -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/someteam.example.com/v1/dateprefixer/go.mod b/plugin/someteam.example.com/v1/dateprefixer/go.mod index deb1d8067..c643a42bb 100644 --- a/plugin/someteam.example.com/v1/dateprefixer/go.mod +++ b/plugin/someteam.example.com/v1/dateprefixer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/dateprefixer -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/someteam.example.com/v1/printpluginenv/go.mod b/plugin/someteam.example.com/v1/printpluginenv/go.mod index 82631f800..84f824c70 100644 --- a/plugin/someteam.example.com/v1/printpluginenv/go.mod +++ b/plugin/someteam.example.com/v1/printpluginenv/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/printpluginenv -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod b/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod index e4565e418..2dd03f570 100644 --- a/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod +++ b/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/secretsfromdatabase -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/someteam.example.com/v1/sedtransformer/go.mod b/plugin/someteam.example.com/v1/sedtransformer/go.mod index 002e7434c..c5b1bbd6a 100644 --- a/plugin/someteam.example.com/v1/sedtransformer/go.mod +++ b/plugin/someteam.example.com/v1/sedtransformer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/sedtransformer -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/someteam.example.com/v1/someservicegenerator/go.mod b/plugin/someteam.example.com/v1/someservicegenerator/go.mod index 35704aef8..804027838 100644 --- a/plugin/someteam.example.com/v1/someservicegenerator/go.mod +++ b/plugin/someteam.example.com/v1/someservicegenerator/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/someservicegenerator -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/someteam.example.com/v1/stringprefixer/go.mod b/plugin/someteam.example.com/v1/stringprefixer/go.mod index 36b2180da..48918af11 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/go.mod +++ b/plugin/someteam.example.com/v1/stringprefixer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/stringprefixer -go 1.24.0 +go 1.25 require ( sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/someteam.example.com/v1/validator/go.mod b/plugin/someteam.example.com/v1/validator/go.mod index f1db50edf..6ca5c2baa 100644 --- a/plugin/someteam.example.com/v1/validator/go.mod +++ b/plugin/someteam.example.com/v1/validator/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/validator -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/api v0.21.1 diff --git a/plugin/untested/v1/gogetter/go.mod b/plugin/untested/v1/gogetter/go.mod index 26426e4cb..5b014346e 100644 --- a/plugin/untested/v1/gogetter/go.mod +++ b/plugin/untested/v1/gogetter/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/untested/v1/gogetter -go 1.24.0 +go 1.25 require sigs.k8s.io/kustomize/api v0.21.1 diff --git a/site/Dockerfile b/site/Dockerfile index 1e2a67aac..3c69e9ca9 100644 --- a/site/Dockerfile +++ b/site/Dockerfile @@ -3,7 +3,7 @@ # This Dockerfile is based on: # (https://github.com/kubernetes/website/blob/main/Dockerfile) -FROM docker.io/library/golang:1.24.6-alpine +FROM docker.io/library/golang:1.25.7-alpine RUN apk add --no-cache \ curl \ @@ -19,7 +19,7 @@ COPY hack/go.mod ./ COPY hack/go.sum ./ RUN go install --tags extended github.com/gohugoio/hugo -FROM docker.io/library/golang:1.24.6-alpine +FROM docker.io/library/golang:1.25.7-alpine RUN apk add --no-cache \ runuser \