diff --git a/.golangci.yml b/.golangci.yml index d72c3909b..35e72d433 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,7 +3,7 @@ run: deadline: 5m - go: '1.21' + go: '1.22' linters: enable-all: true diff --git a/api/go.mod b/api/go.mod index d3b76a6df..8464d923e 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/api -go 1.21 +go 1.22.7 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 2ca02ce0a..48089c203 100644 --- a/cmd/config/docs/api-conventions/functions-impl.md +++ b/cmd/config/docs/api-conventions/functions-impl.md @@ -1,29 +1,33 @@ # Running Configuration Functions using kustomize CLI -Configuration functions can be implemented using any toolchain and invoked using any -container workflow orchestrator including Tekton, Cloud Build, or run directly using `docker run`. +Configuration functions can be implemented using any toolchain and invoked using +any container workflow orchestrator including Tekton, Cloud Build, or run +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 @@ -82,10 +86,11 @@ 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 golang:1.21-bullseye +FROM public.ecr.aws/docker/library/golang:1.22.7-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 @@ -94,7 +99,8 @@ CMD ["nginx-template.sh] ## Example Function Usage -Following is an example of running the `kustomize fn run` using the preceding API. +Following is an example of running the `kustomize fn run` using the preceding +API. When run by `kustomize fn run`, functions are run in containers with the following environment: @@ -102,12 +108,14 @@ following environment: - Network: `none` - User: `nobody` - Security Options: `no-new-privileges` -- Volumes: the volume containing the `functionConfig` yaml is mounted under `/local` as `ro` +- Volumes: the volume containing the `functionConfig` yaml is mounted under + `/local` as `ro` ### Input -`dir/nginx.yaml` contains a reference to the Function. The contents of `nginx.yaml` -are passed to the Function through the `ResourceList.functionConfig` field. +`dir/nginx.yaml` contains a reference to the Function. The contents of +`nginx.yaml` are passed to the Function through the +`ResourceList.functionConfig` field. ```yaml apiVersion: example.com/v1beta1 @@ -123,9 +131,10 @@ spec: replicas: 5 ``` -- `annotations[config.kubernetes.io/function].container.image`: the image to use for this API -- `annotations[config.kubernetes.io/local-config]`: mark this as not a Resource that should - be applied +- `annotations[config.kubernetes.io/function].container.image`: the image to use + for this API +- `annotations[config.kubernetes.io/local-config]`: mark this as not a Resource + that should be applied ### Output diff --git a/cmd/config/go.mod b/cmd/config/go.mod index fb5758b66..7a3e877f6 100644 --- a/cmd/config/go.mod +++ b/cmd/config/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/config -go 1.21 +go 1.22.7 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 66b6f14f3..f2803e1a9 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 golang:1.21-bullseye +FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye 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 68aca9989..671ce200a 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.21 +go 1.22.7 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 11bb5b295..6c07f3db3 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 golang:1.21-bullseye +FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye 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 4ad834976..fa52e4ba2 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.21 +go 1.22.7 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 a1d4ea00c..2d5d13a00 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 golang:1.21-bullseye +FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye 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 a5ad1e91f..8e13e5279 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.21 +go 1.22.7 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 f0cea8ec6..6d342d805 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 golang:1.21-bullseye +FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye 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 1f65af0e4..bd322f3a1 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.21 +go 1.22.7 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 ba03f8ddf..0776145c8 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 golang:1.21-bullseye + FROM public.ecr.aws/docker/library/golang:1.22.7-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/depprobcheck/go.mod b/cmd/depprobcheck/go.mod index a3a7b81cf..fe7c7fce1 100644 --- a/cmd/depprobcheck/go.mod +++ b/cmd/depprobcheck/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/depprobcheck -go 1.21 +go 1.22.7 require ( k8s.io/cli-runtime v0.20.4 diff --git a/cmd/gorepomod/go.mod b/cmd/gorepomod/go.mod index fff29540e..f99caadc9 100644 --- a/cmd/gorepomod/go.mod +++ b/cmd/gorepomod/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/gorepomod -go 1.21 +go 1.22.7 require ( github.com/spf13/viper v1.17.0 diff --git a/cmd/k8scopy/go.mod b/cmd/k8scopy/go.mod index e223671f1..6215eb08a 100644 --- a/cmd/k8scopy/go.mod +++ b/cmd/k8scopy/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/cmd/k8scopy -go 1.21 +go 1.22.7 require ( github.com/stretchr/testify v1.8.4 diff --git a/cmd/mdtogo/go.mod b/cmd/mdtogo/go.mod index 930d22457..d5b83d4eb 100644 --- a/cmd/mdtogo/go.mod +++ b/cmd/mdtogo/go.mod @@ -1,3 +1,3 @@ module sigs.k8s.io/kustomize/cmd/mdtogo -go 1.21 +go 1.22.7 diff --git a/cmd/pluginator/go.mod b/cmd/pluginator/go.mod index 977c7b35f..f7c15cd1a 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.21 +go 1.22.7 require ( github.com/spf13/cobra v1.8.0 diff --git a/cmd/pluginator/internal/krmfunction/converter.go b/cmd/pluginator/internal/krmfunction/converter.go index b38298993..a1098fc26 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 golang:1.21-bullseye + return `FROM public.ecr.aws/docker/library/golang:1.22.7-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 438207a96..cd9107117 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.21 +go 1.22.7 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 70a9ae188..4252a8845 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 golang:1.21-bullseye +FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye 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 46f1ad9e6..7a360819e 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.21 +go 1.22.7 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 da401b51e..0324d432f 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.21 +go 1.22.7 require ( github.com/spf13/cobra v1.8.0 diff --git a/functions/examples/injection-tshirt-sizes/image/Dockerfile b/functions/examples/injection-tshirt-sizes/image/Dockerfile index 70a9ae188..4252a8845 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 golang:1.21-bullseye +FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye 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 11c41a669..4dfee95da 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.21 +go 1.22.7 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 70a9ae188..4252a8845 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 golang:1.21-bullseye +FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye 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 18752fda3..96d1593e5 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.21 +go 1.22.7 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 efb5b9d71..9481dd742 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 golang:1.21-bullseye as function +FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye 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 1f96888dd..ba978f8e3 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.21 +go 1.22.7 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 70a9ae188..4252a8845 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 golang:1.21-bullseye +FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye 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 64c4f2841..24619b81b 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.21 +go 1.22.7 require sigs.k8s.io/kustomize/kyaml v0.13.7 diff --git a/go.work b/go.work index 60d4ac044..a22c8d6a0 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.21 +go 1.22.7 use ( ./api diff --git a/hack/go.mod b/hack/go.mod index 443815df1..774ac4ab6 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/hack -go 1.21 +go 1.22.7 require ( github.com/campoy/embedmd v1.0.0 diff --git a/kustomize.Dockerfile b/kustomize.Dockerfile index 0a3df069b..15c2958db 100644 --- a/kustomize.Dockerfile +++ b/kustomize.Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # build -FROM golang:alpine as builder +FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye as builder ARG VERSION ARG COMMIT ARG DATE diff --git a/kustomize/go.mod b/kustomize/go.mod index df9eae845..d802015a8 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/kustomize/v5 -go 1.21 +go 1.22.7 require ( github.com/google/go-cmp v0.6.0 diff --git a/kyaml/fn/framework/command/command.go b/kyaml/fn/framework/command/command.go index 219617c0b..6494c2a07 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 golang:1.21-alpine as builder + if err := os.WriteFile(filepath.Join(args[0], "Dockerfile"), []byte(`FROM public.ecr.aws/docker/library/golang:1.22.7-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 3f423c3d2..9334b88c4 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 golang:1.21-alpine as builder + expected := `FROM public.ecr.aws/docker/library/golang:1.22.7-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 8b19d4460..04c1de5ae 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 golang:1.21-bullseye +FROM public.ecr.aws/docker/library/golang:1.22.7-bullseye ENV CGO_ENABLED=0 WORKDIR /go/src/ COPY . . diff --git a/kyaml/go.mod b/kyaml/go.mod index 98c81003b..cd15d9f85 100644 --- a/kyaml/go.mod +++ b/kyaml/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/kyaml -go 1.21 +go 1.22.7 require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc diff --git a/plugin/builtin/annotationstransformer/go.mod b/plugin/builtin/annotationstransformer/go.mod index eecd3e420..a6bfe0f9a 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/builtin/configmapgenerator/go.mod b/plugin/builtin/configmapgenerator/go.mod index ae428249f..7c345f574 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/builtin/hashtransformer/go.mod b/plugin/builtin/hashtransformer/go.mod index d548e2b52..7af352786 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.21 +go 1.22.7 require sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/builtin/helmchartinflationgenerator/go.mod b/plugin/builtin/helmchartinflationgenerator/go.mod index 0f648ad3d..4e6d0d437 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.21 +go 1.22.7 require ( github.com/stretchr/testify v1.8.4 diff --git a/plugin/builtin/iampolicygenerator/go.mod b/plugin/builtin/iampolicygenerator/go.mod index ac2c7592d..bcb43a1fa 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/builtin/imagetagtransformer/go.mod b/plugin/builtin/imagetagtransformer/go.mod index 231e11fc4..724da496f 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/builtin/labeltransformer/go.mod b/plugin/builtin/labeltransformer/go.mod index 1de5a344e..2d2faea96 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/builtin/namespacetransformer/go.mod b/plugin/builtin/namespacetransformer/go.mod index 2c9e5f9ba..aa24b3faf 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.21 +go 1.22.7 require ( github.com/stretchr/testify v1.8.4 diff --git a/plugin/builtin/patchjson6902transformer/go.mod b/plugin/builtin/patchjson6902transformer/go.mod index 881cb4402..23cb39275 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.21 +go 1.22.7 require ( gopkg.in/evanphx/json-patch.v4 v4.12.0 diff --git a/plugin/builtin/patchstrategicmergetransformer/go.mod b/plugin/builtin/patchstrategicmergetransformer/go.mod index 7e3b2e0f2..992be1cd7 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.21 +go 1.22.7 require ( github.com/stretchr/testify v1.8.4 diff --git a/plugin/builtin/patchtransformer/go.mod b/plugin/builtin/patchtransformer/go.mod index f040d3420..e3173ad96 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.21 +go 1.22.7 require ( github.com/stretchr/testify v1.8.4 diff --git a/plugin/builtin/prefixtransformer/go.mod b/plugin/builtin/prefixtransformer/go.mod index e3b78d9d3..551ec824a 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/builtin/replacementtransformer/go.mod b/plugin/builtin/replacementtransformer/go.mod index c4705f2bb..5acd23bed 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/builtin/replicacounttransformer/go.mod b/plugin/builtin/replicacounttransformer/go.mod index 99e7beae1..c6cd65890 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/builtin/secretgenerator/go.mod b/plugin/builtin/secretgenerator/go.mod index 24feac74b..cc8c1aca8 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/builtin/sortordertransformer/go.mod b/plugin/builtin/sortordertransformer/go.mod index a417d8e16..2dc97c35a 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.21 +go 1.22.7 require ( github.com/stretchr/testify v1.8.4 diff --git a/plugin/builtin/suffixtransformer/go.mod b/plugin/builtin/suffixtransformer/go.mod index af192f61f..34fa1f4e1 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/builtin/valueaddtransformer/go.mod b/plugin/builtin/valueaddtransformer/go.mod index d73538e8e..84b8e247a 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/someteam.example.com/v1/bashedconfigmap/go.mod b/plugin/someteam.example.com/v1/bashedconfigmap/go.mod index 717fa372d..9a3e4e75d 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.21 +go 1.22.7 require sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/someteam.example.com/v1/calvinduplicator/go.mod b/plugin/someteam.example.com/v1/calvinduplicator/go.mod index 9a8b4a0d7..dfa9b3df2 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/someteam.example.com/v1/dateprefixer/go.mod b/plugin/someteam.example.com/v1/dateprefixer/go.mod index c6b92b8a9..436333030 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/someteam.example.com/v1/printpluginenv/go.mod b/plugin/someteam.example.com/v1/printpluginenv/go.mod index 81ed41563..10dbc5141 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.21 +go 1.22.7 require sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod b/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod index c30772deb..e548f3f9d 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/someteam.example.com/v1/sedtransformer/go.mod b/plugin/someteam.example.com/v1/sedtransformer/go.mod index d86f55955..9acf6f9c7 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.21 +go 1.22.7 require sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/someteam.example.com/v1/someservicegenerator/go.mod b/plugin/someteam.example.com/v1/someservicegenerator/go.mod index 22a2d23cb..1b7cb5ce1 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/someteam.example.com/v1/starlarkmixer/go.mod b/plugin/someteam.example.com/v1/starlarkmixer/go.mod index fdc70ddc9..64d71a80c 100644 --- a/plugin/someteam.example.com/v1/starlarkmixer/go.mod +++ b/plugin/someteam.example.com/v1/starlarkmixer/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/starlarkmixer -go 1.21 +go 1.22.7 require sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/someteam.example.com/v1/stringprefixer/go.mod b/plugin/someteam.example.com/v1/stringprefixer/go.mod index 72d1fc238..381ff9604 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.21 +go 1.22.7 require ( sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/someteam.example.com/v1/validator/go.mod b/plugin/someteam.example.com/v1/validator/go.mod index b1b6f0bb9..43fb58401 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.21 +go 1.22.7 require sigs.k8s.io/kustomize/api v0.17.3 diff --git a/plugin/untested/v1/gogetter/go.mod b/plugin/untested/v1/gogetter/go.mod index 64ca87929..e3f8aa6d9 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.21 +go 1.22.7 require sigs.k8s.io/kustomize/api v0.17.3 diff --git a/site/Dockerfile b/site/Dockerfile index a5d870895..ac2f3ae40 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.21-alpine +FROM docker.io/library/golang:1.22-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.21-alpine +FROM docker.io/library/golang:1.22-alpine RUN apk add --no-cache \ runuser \ diff --git a/site/content/en/contribute/mac/_index.md b/site/content/en/contribute/mac/_index.md index 8be75339e..56aa8f03a 100644 --- a/site/content/en/contribute/mac/_index.md +++ b/site/content/en/contribute/mac/_index.md @@ -9,7 +9,7 @@ description: > First install the tools to build and run tests -### Install go 1.21 +### Install go [Instructions](https://golang.org/doc/install)