diff --git a/.github/workflows/apidiff.yml b/.github/workflows/apidiff.yml index 3f9dc6e682..55c80bd774 100644 --- a/.github/workflows/apidiff.yml +++ b/.github/workflows/apidiff.yml @@ -19,6 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: + go-version: '1.24.4' go-version-file: go.work - name: Execute go-apidiff uses: joelanford/go-apidiff@v0.8.3 diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index d735c63666..3e3a2ce2df 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -38,6 +38,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v5 with: + go-version: '1.24.4' go-version-file: go.work id: go - name: sync go modules @@ -58,6 +59,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v5 with: + go-version: '1.24.4' go-version-file: go.work id: go - name: Lint @@ -76,6 +78,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v5 with: + go-version: '1.24.4' go-version-file: go.work id: go - name: Test all modules @@ -94,6 +97,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v5 with: + go-version: '1.24.4' go-version-file: go.work id: go - name: Test all modules @@ -112,6 +116,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v5 with: + go-version: '1.24.4' go-version-file: go.work id: go - name: Test kyaml diff --git a/.golangci.yml b/.golangci.yml index f1a339cc19..b6178eaebb 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,7 +3,7 @@ run: deadline: 5m - go: '1.22' + go: '1.24' linters: enable-all: true diff --git a/api/internal/builtins/AnnotationsTransformer.go b/api/internal/builtins/AnnotationsTransformer.go index 0910c472b8..54a44a5ce5 100644 --- a/api/internal/builtins/AnnotationsTransformer.go +++ b/api/internal/builtins/AnnotationsTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on AnnotationsTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/ConfigMapGenerator.go b/api/internal/builtins/ConfigMapGenerator.go index dc18bce858..675e9ef388 100644 --- a/api/internal/builtins/ConfigMapGenerator.go +++ b/api/internal/builtins/ConfigMapGenerator.go @@ -1,5 +1,5 @@ // Code generated by pluginator on ConfigMapGenerator; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/HashTransformer.go b/api/internal/builtins/HashTransformer.go index ec23312651..839aae7b36 100644 --- a/api/internal/builtins/HashTransformer.go +++ b/api/internal/builtins/HashTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on HashTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/HelmChartInflationGenerator.go b/api/internal/builtins/HelmChartInflationGenerator.go index 5811e73eca..5da059f6f3 100644 --- a/api/internal/builtins/HelmChartInflationGenerator.go +++ b/api/internal/builtins/HelmChartInflationGenerator.go @@ -1,5 +1,5 @@ // Code generated by pluginator on HelmChartInflationGenerator; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/IAMPolicyGenerator.go b/api/internal/builtins/IAMPolicyGenerator.go index cfb1fa81b6..39062ab998 100644 --- a/api/internal/builtins/IAMPolicyGenerator.go +++ b/api/internal/builtins/IAMPolicyGenerator.go @@ -1,5 +1,5 @@ // Code generated by pluginator on IAMPolicyGenerator; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/ImageTagTransformer.go b/api/internal/builtins/ImageTagTransformer.go index ffde73a7a1..f7ae40a621 100644 --- a/api/internal/builtins/ImageTagTransformer.go +++ b/api/internal/builtins/ImageTagTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on ImageTagTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/LabelTransformer.go b/api/internal/builtins/LabelTransformer.go index c45731b54b..1bb942260c 100644 --- a/api/internal/builtins/LabelTransformer.go +++ b/api/internal/builtins/LabelTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on LabelTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/NamespaceTransformer.go b/api/internal/builtins/NamespaceTransformer.go index d839fb9751..4c01d62dea 100644 --- a/api/internal/builtins/NamespaceTransformer.go +++ b/api/internal/builtins/NamespaceTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on NamespaceTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/PatchJson6902Transformer.go b/api/internal/builtins/PatchJson6902Transformer.go index 04625e5109..514aaa4feb 100644 --- a/api/internal/builtins/PatchJson6902Transformer.go +++ b/api/internal/builtins/PatchJson6902Transformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on PatchJson6902Transformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/PatchStrategicMergeTransformer.go b/api/internal/builtins/PatchStrategicMergeTransformer.go index d68f2425ea..20d0c4351d 100644 --- a/api/internal/builtins/PatchStrategicMergeTransformer.go +++ b/api/internal/builtins/PatchStrategicMergeTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on PatchStrategicMergeTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/PatchTransformer.go b/api/internal/builtins/PatchTransformer.go index 6161ada864..3c64ecf0b3 100644 --- a/api/internal/builtins/PatchTransformer.go +++ b/api/internal/builtins/PatchTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on PatchTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/PrefixTransformer.go b/api/internal/builtins/PrefixTransformer.go index 33700bb4b1..ac13a0a801 100644 --- a/api/internal/builtins/PrefixTransformer.go +++ b/api/internal/builtins/PrefixTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on PrefixTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/ReplacementTransformer.go b/api/internal/builtins/ReplacementTransformer.go index ef0c932128..c83833cf0c 100644 --- a/api/internal/builtins/ReplacementTransformer.go +++ b/api/internal/builtins/ReplacementTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on ReplacementTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/ReplicaCountTransformer.go b/api/internal/builtins/ReplicaCountTransformer.go index c87d64251c..a96fafa47e 100644 --- a/api/internal/builtins/ReplicaCountTransformer.go +++ b/api/internal/builtins/ReplicaCountTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on ReplicaCountTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/SecretGenerator.go b/api/internal/builtins/SecretGenerator.go index 2a4ef1c903..40579e372a 100644 --- a/api/internal/builtins/SecretGenerator.go +++ b/api/internal/builtins/SecretGenerator.go @@ -1,5 +1,5 @@ // Code generated by pluginator on SecretGenerator; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/SortOrderTransformer.go b/api/internal/builtins/SortOrderTransformer.go index 90e290719e..bc9612b686 100644 --- a/api/internal/builtins/SortOrderTransformer.go +++ b/api/internal/builtins/SortOrderTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on SortOrderTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/SuffixTransformer.go b/api/internal/builtins/SuffixTransformer.go index 31b5b8fea0..d8474c0a37 100644 --- a/api/internal/builtins/SuffixTransformer.go +++ b/api/internal/builtins/SuffixTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on SuffixTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/api/internal/builtins/ValueAddTransformer.go b/api/internal/builtins/ValueAddTransformer.go index 1d70c98c2c..3e8ff130ba 100644 --- a/api/internal/builtins/ValueAddTransformer.go +++ b/api/internal/builtins/ValueAddTransformer.go @@ -1,5 +1,5 @@ // Code generated by pluginator on ValueAddTransformer; DO NOT EDIT. -// pluginator {(devel) unknown } +// pluginator {v0.0.0-20250811204907-f74736130c6d+dirty unknown } package builtins diff --git a/cmd/config/docs/api-conventions/functions-impl.md b/cmd/config/docs/api-conventions/functions-impl.md index 48089c2034..9fc9a1a115 100644 --- a/cmd/config/docs/api-conventions/functions-impl.md +++ b/cmd/config/docs/api-conventions/functions-impl.md @@ -6,28 +6,21 @@ directly using `docker run`. Run `config help docs-fn-spec` to see the Configuration Functions Specification. -`kustomize fn run` is an example orchestrator for invoking Configuration -Functions. This document describes how to implement and invoke an example -function. +`kustomize fn run` is an example orchestrator for invoking Configuration Functions. This document describes how to implement and invoke an example function. ## Example Function Implementation -Following is an example for implementing an nginx abstraction using a -configuration function. +Following is an example for implementing an nginx abstraction using a configuration function. ### `nginx-template.sh` -`nginx-template.sh` is a simple bash script which uses a _heredoc_ as a -templating solution for generating Resources from the functionConfig input -fields. +`nginx-template.sh` is a simple bash script which uses a _heredoc_ as a templating solution for generating Resources from the functionConfig input fields. The script wraps itself using `config run wrap -- $0` which will: -1. Parse the `ResourceList.functionConfig` (provided to the container stdin) - into env vars +1. Parse the `ResourceList.functionConfig` (provided to the container stdin) into env vars 2. Merge the stdout into the original list of Resources -3. Defaults filenames for newly generated Resources (if they are not set as - annotations) to `config/NAME_KIND.yaml` +3. Defaults filenames for newly generated Resources (if they are not set as annotations) to `config/NAME_KIND.yaml` 4. Format the output ```bash @@ -86,11 +79,10 @@ End-of-message ### Dockerfile -`Dockerfile` installs `kustomize fn` and copies the script into the container -image. +`Dockerfile` installs `kustomize fn` and copies the script into the container image. ``` -FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye +FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye 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/internal/commands/e2e/e2econtainerconfig/Dockerfile b/cmd/config/internal/commands/e2e/e2econtainerconfig/Dockerfile index f2803e1a95..424fcca30b 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.22.7-bullseye +FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye ENV CGO_ENABLED=0 WORKDIR /go/src/ diff --git a/cmd/config/internal/commands/e2e/e2econtainerenvgenerator/Dockerfile b/cmd/config/internal/commands/e2e/e2econtainerenvgenerator/Dockerfile index 6c07f3db3d..a5021d7182 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.22.7-bullseye +FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye ENV CGO_ENABLED=0 WORKDIR /go/src/ diff --git a/cmd/config/internal/commands/e2e/e2econtainermountbind/Dockerfile b/cmd/config/internal/commands/e2e/e2econtainermountbind/Dockerfile index 2d5d13a001..4c5c0fc244 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.22.7-bullseye +FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye ENV CGO_ENABLED=0 WORKDIR /go/src/ diff --git a/cmd/config/internal/commands/e2e/e2econtainersimplegenerator/Dockerfile b/cmd/config/internal/commands/e2e/e2econtainersimplegenerator/Dockerfile index 6d342d8054..4ea8748374 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.22.7-bullseye +FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye ENV CGO_ENABLED=0 WORKDIR /go/src/ diff --git a/cmd/config/internal/generateddocs/api/docs.go b/cmd/config/internal/generateddocs/api/docs.go index 0776145c8f..a38fb1d639 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.22.7-bullseye + FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye 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/pluginator/internal/krmfunction/converter.go b/cmd/pluginator/internal/krmfunction/converter.go index a1098fc269..e379919912 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.22.7-bullseye + return `FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye 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 cd9107117a..707b1971bd 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.22.7 +go 1.24.4 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 4252a8845f..152fa4b524 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.22.7-bullseye +FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY go.mod . diff --git a/functions/examples/injection-tshirt-sizes/image/Dockerfile b/functions/examples/injection-tshirt-sizes/image/Dockerfile index 4252a8845f..9ab4bba282 100644 --- a/functions/examples/injection-tshirt-sizes/image/Dockerfile +++ b/functions/examples/injection-tshirt-sizes/image/Dockerfile @@ -1,15 +1,12 @@ # Copyright 2019 The Kubernetes Authors. # SPDX-License-Identifier: Apache-2.0 -FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye +FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye ENV CGO_ENABLED=0 WORKDIR /go/src/ -COPY go.mod . -COPY go.sum . -RUN go mod download -COPY main.go . -RUN go build -v -o /usr/local/bin/config-function ./ +COPY . . +RUN go build -v -o /usr/local/bin/function ./ FROM alpine:latest -COPY --from=0 /usr/local/bin/config-function /usr/local/bin/config-function -CMD ["config-function"] +COPY --from=0 /usr/local/bin/function /usr/local/bin/function +CMD ["function"] diff --git a/functions/examples/template-go-nginx/image/Dockerfile b/functions/examples/template-go-nginx/image/Dockerfile index 4252a8845f..152fa4b524 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.22.7-bullseye +FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY go.mod . diff --git a/functions/examples/validator-kubeval/image/Dockerfile b/functions/examples/validator-kubeval/image/Dockerfile index 9481dd7421..49ef178d2d 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.22.7-bullseye as function +FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye as function ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY go.mod . diff --git a/functions/examples/validator-resource-requests/image/Dockerfile b/functions/examples/validator-resource-requests/image/Dockerfile index 4252a8845f..152fa4b524 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.22.7-bullseye +FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY go.mod . diff --git a/go.work b/go.work index c17bd0af38..bc16276abf 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,5 @@ go 1.22.7 +toolchain go1.24.4 use ( ./api diff --git a/go.work.sum b/go.work.sum index af67d035fd..eac15a049b 100644 --- a/go.work.sum +++ b/go.work.sum @@ -633,6 +633,7 @@ github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dX github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/GoogleCloudPlatform/cloudsql-proxy v1.33.9 h1:YjE60yhoMx231GwDrJgeBWSTbTbazZAuK89H0iuXJlM= github.com/GoogleCloudPlatform/cloudsql-proxy v1.33.9/go.mod h1:+FaFzlKsx+X/2dR5Rjr6EN9ZzuYDW950s4MmFILchJM= +github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0/go.mod h1:dppbR7CwXD4pgtV9t3wD1812RaLDcBjtblcDF5f1vI0= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1/go.mod h1:itPGVDKf9cC/ov4MdvJ2QZ0khw4bfoo9jzwTJlaxy2k= github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -1645,5 +1646,3 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2S sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y= sigs.k8s.io/kustomize/cmd/config v0.19.0/go.mod h1:29Vvdl26PidPLUDi7nfjYa/I0wHBkwCZp15Nlcc4y98= sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU= -sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ= -sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4= diff --git a/kustomize.Dockerfile b/kustomize.Dockerfile index e9b0e702ec..4b105da697 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.22.7-bullseye AS builder +FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye AS builder ARG VERSION ARG DATE RUN mkdir /build diff --git a/kyaml/fn/framework/command/command.go b/kyaml/fn/framework/command/command.go index 6494c2a075..29e1c5dea8 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.22.7-bullseye as builder + if err := os.WriteFile(filepath.Join(args[0], "Dockerfile"), []byte(`FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye 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 9334b88c43..10ab5a3e2a 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.22.7-bullseye as builder + expected := `FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye 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 04c1de5ae3..9ab4bba282 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.22.7-bullseye +FROM public.ecr.aws/docker/library/golang:1.24.4-bullseye ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY . . diff --git a/site/Dockerfile b/site/Dockerfile index ac2f3ae409..ce56c08ddb 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.22-alpine +FROM docker.io/library/golang:1.24.4-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.22-alpine +FROM docker.io/library/golang:1.24.4-alpine RUN apk add --no-cache \ runuser \