Update to Go 1.19

kubernetes-sigs · Nov 17, 2022 · 91a2c2b · 91a2c2b
1 parent 62f0dab
commit 91a2c2b
Show file tree

Hide file tree

Showing 63 changed files with 67 additions and 66 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: ^1.18
+        go-version: '^1.19.0'
       id: go
 
     - name: Check out code into the Go module directory
@@ -41,7 +41,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.18
+          go-version: '^1.19.0'
         id: go
 
       - name: Check out code into the Go module directory
@@ -60,7 +60,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.18
+          go-version: '^1.19.0'
         id: go
 
       - name: Check out code into the Go module directory
@@ -79,7 +79,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.18
+          go-version: '^1.19.0'
         id: go
 
       - name: Check out code into the Go module directory

diff --git a/.golangci.yml b/.golangci.yml
@@ -3,6 +3,7 @@
 
 run:
   deadline: 5m
+  go: '1.19'
 
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.

diff --git a/api/go.mod b/api/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/api
 
-go 1.18
+go 1.19
 
 require (
 	github.com/evanphx/json-patch v4.11.0+incompatible

diff --git a/cmd/config/docs/api-conventions/functions-impl.md b/cmd/config/docs/api-conventions/functions-impl.md
@@ -85,7 +85,7 @@ End-of-message
 `Dockerfile` installs `kustomize fn` and copies the script into the container image.
 
 ```
-FROM golang:1.18-stretch
+FROM golang:1.19-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/go.mod b/cmd/config/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/cmd/config
 
-go 1.18
+go 1.19
 
 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
@@ -1,7 +1,7 @@
 # Copyright 2019 The Kubernetes Authors.
 # SPDX-License-Identifier: Apache-2.0
 
-FROM golang:1.18-stretch
+FROM golang:1.19-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
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/cmd/config/internal/commands/e2e/e2econtainerconfig
 
-go 1.18
+go 1.19
 
 require sigs.k8s.io/kustomize/kyaml v0.13.7
 

diff --git a/cmd/config/internal/generateddocs/api/docs.go b/cmd/config/internal/generateddocs/api/docs.go
diff --git a/cmd/depprobcheck/go.mod b/cmd/depprobcheck/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/cmd/depprobcheck
 
-go 1.18
+go 1.19
 
 require (
 	k8s.io/cli-runtime v0.20.4

diff --git a/cmd/gorepomod/go.mod b/cmd/gorepomod/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/cmd/gorepomod
 
-go 1.18
+go 1.19
 
 require golang.org/x/mod v0.4.2
 

diff --git a/cmd/k8scopy/go.mod b/cmd/k8scopy/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/cmd/k8scopy
 
-go 1.18
+go 1.19
 
 require (
 	github.com/stretchr/testify v1.8.0

diff --git a/cmd/mdtogo/go.mod b/cmd/mdtogo/go.mod
@@ -1,3 +1,3 @@
 module sigs.k8s.io/kustomize/cmd/mdtogo
 
-go 1.18
+go 1.19
diff --git a/cmd/pluginator/go.mod b/cmd/pluginator/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/cmd/pluginator/v2
 
-go 1.18
+go 1.19
 
 require (
 	github.com/rakyll/statik v0.1.7

diff --git a/cmd/pluginator/internal/krmfunction/converter.go b/cmd/pluginator/internal/krmfunction/converter.go
@@ -85,7 +85,7 @@ func (c *Converter) Convert() error {
 }
 
 func (c *Converter) getDockerfile() string {
-	return `FROM golang:1.18-stretch
+	return `FROM golang:1.19-bullseye
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY . .

diff --git 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.18-stretch
+FROM golang:1.19-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
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/functions/examples/application-cr
 
-go 1.18
+go 1.19
 
 require (
 	k8s.io/apimachinery v0.20.4

diff --git 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.18-stretch
+FROM golang:1.19-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
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/functions/examples/injection-tshirt-sizes
 
-go 1.18
+go 1.19
 
 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
@@ -1,7 +1,7 @@
 # Copyright 2019 The Kubernetes Authors.
 # SPDX-License-Identifier: Apache-2.0
 
-FROM golang:1.18-stretch
+FROM golang:1.19-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
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/functions/examples/template-go-nginx
 
-go 1.18
+go 1.19
 
 require sigs.k8s.io/kustomize/kyaml v0.13.7
 

diff --git a/functions/examples/template-heredoc-cockroachdb/image/Dockerfile b/functions/examples/template-heredoc-cockroachdb/image/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2019 The Kubernetes Authors.
 # SPDX-License-Identifier: Apache-2.0
 
-FROM golang:1.18-stretch
+FROM golang:1.19-bullseye
 ENV CGO_ENABLED=0
 RUN go get -v sigs.k8s.io/kustomize/kustomize
 

diff --git 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.18-stretch as function
+FROM golang:1.19-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
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/functions/examples/validator-kubeval
 
-go 1.18
+go 1.19
 
 require (
 	github.com/instrumenta/kubeval v0.0.0-20190918223246-8d013ec9fc56

diff --git 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.18-stretch
+FROM golang:1.19-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
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/functions/examples/validator-resource-requests
 
-go 1.18
+go 1.19
 
 require sigs.k8s.io/kustomize/kyaml v0.13.7
 

diff --git a/go.work b/go.work
@@ -1,4 +1,4 @@
-go 1.18
+go 1.19
 
 use (
 	./api

diff --git a/kustomize/go.mod b/kustomize/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/kustomize/v4
 
-go 1.18
+go 1.19
 
 require (
 	github.com/google/go-cmp v0.5.5

diff --git a/kyaml/fn/framework/command/command.go b/kyaml/fn/framework/command/command.go
@@ -115,13 +115,13 @@ func Build(p framework.ResourceListProcessor, mode CLIMode, noPrintError bool) *
 // the function into a container image.
 // The gen command takes one argument: the directory where the Dockerfile will be created.
 //
-//		go run main.go gen DIR/
+//	go run main.go gen DIR/
 func AddGenerateDockerfile(cmd *cobra.Command) {
 	gen := &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.18-alpine as builder
+			if err := os.WriteFile(filepath.Join(args[0], "Dockerfile"), []byte(`FROM golang:1.19-alpine 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
@@ -41,7 +41,7 @@ func TestCommand_dockerfile(t *testing.T) {
 		t.FailNow()
 	}
 
-	expected := `FROM golang:1.18-alpine as builder
+	expected := `FROM golang:1.19-alpine 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
@@ -1,7 +1,7 @@
 # Copyright 2019 The Kubernetes Authors.
 # SPDX-License-Identifier: Apache-2.0
 
-FROM golang:1.18-stretch
+FROM golang:1.19-bullseye
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY . .

diff --git a/kyaml/go.mod b/kyaml/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/kyaml
 
-go 1.18
+go 1.19
 
 require (
 	github.com/davecgh/go-spew v1.1.1

diff --git 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.18
+go 1.19
 
 require (
 	sigs.k8s.io/kustomize/api v0.11.5

diff --git 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.18
+go 1.19
 
 require (
 	sigs.k8s.io/kustomize/api v0.11.5

diff --git 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.18
+go 1.19
 
 require sigs.k8s.io/kustomize/api v0.11.5
 

diff --git 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.18
+go 1.19
 
 require (
 	github.com/imdario/mergo v0.3.6

diff --git a/plugin/builtin/iampolicygenerator/go.mod b/plugin/builtin/iampolicygenerator/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/plugin/builtin/iampolicypgenerator
 
-go 1.18
+go 1.19
 
 require (
 	sigs.k8s.io/kustomize/api v0.11.5

diff --git 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.18
+go 1.19
 
 require (
 	sigs.k8s.io/kustomize/api v0.11.5

diff --git 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.18
+go 1.19
 
 require (
 	sigs.k8s.io/kustomize/api v0.11.5

diff --git a/plugin/builtin/legacyordertransformer/go.mod b/plugin/builtin/legacyordertransformer/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kustomize/plugin/builtin/legacyordertransformer
 
-go 1.18
+go 1.19
 
 require (
 	github.com/pkg/errors v0.9.1

diff --git 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.18
+go 1.19
 
 require (
 	github.com/stretchr/testify v1.8.0

diff --git 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.18
+go 1.19
 
 require (
 	github.com/evanphx/json-patch v4.11.0+incompatible

diff --git 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.18
+go 1.19
 
 require (
 	github.com/stretchr/testify v1.8.0

diff --git 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.18
+go 1.19
 
 require (
 	github.com/evanphx/json-patch v4.11.0+incompatible

diff --git 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.18
+go 1.19
 
 require (
 	sigs.k8s.io/kustomize/api v0.11.5