update go 1.18

2026-06-13 01:50:55 +00:00 · 2022-07-07 19:50:47 +00:00
parent 4653f5d9d3
commit 6fb96b7d53
88 changed files with 1243 additions and 14144 deletions
--- 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.13-stretch
+FROM golang:1.18-stretch
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY go.mod .
--- a/functions/examples/application-cr/image/go.mod
+++ b/functions/examples/application-cr/image/go.mod
@@ -1,11 +1,38 @@
 module sigs.k8s.io/kustomize/functions/examples/application-cr

-go 1.16
+go 1.18

 require (
-	github.com/evanphx/json-patch v4.11.0+incompatible // indirect
 	k8s.io/apimachinery v0.18.3
 	sigs.k8s.io/application v0.8.2
 	sigs.k8s.io/kustomize/kyaml v0.7.1
 	sigs.k8s.io/yaml v1.2.0
 )
+
+require (
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/evanphx/json-patch v4.11.0+incompatible // indirect
+	github.com/go-errors/errors v1.0.1 // indirect
+	github.com/go-openapi/jsonpointer v0.19.3 // indirect
+	github.com/go-openapi/jsonreference v0.19.3 // indirect
+	github.com/go-openapi/spec v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.5 // indirect
+	github.com/gogo/protobuf v1.3.1 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/json-iterator/go v1.1.8 // indirect
+	github.com/mailru/easyjson v0.7.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
+	golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 // indirect
+	golang.org/x/text v0.3.2 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.3.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 // indirect
+	k8s.io/api v0.17.0 // indirect
+	k8s.io/klog v1.0.0 // indirect
+	sigs.k8s.io/controller-runtime v0.4.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
+)
--- a/functions/examples/application-cr/image/go.sum
+++ b/functions/examples/application-cr/image/go.sum
@@ -543,7 +543,6 @@ sigs.k8s.io/kustomize/kyaml v0.7.1 h1:Ih6SJPvfKYfZaIFWUa2YAyg/0ZSTpA3LFjR/hv7+8a
 sigs.k8s.io/kustomize/kyaml v0.7.1/go.mod h1:ne3F9JPhW2wrVaLslxBsEe6MQJQ9YK5rUutrdhBWXwI=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
-sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU=
 sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18=
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E=
--- 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.13-stretch
+FROM golang:1.18-stretch
 ENV CGO_ENABLED=0
 RUN go get -v sigs.k8s.io/kustomize/kustomize

--- 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.13-stretch as function
+FROM golang:1.18-stretch as function
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY go.mod .
--- a/functions/examples/validator-kubeval/image/go.mod
+++ b/functions/examples/validator-kubeval/image/go.mod
@@ -1,8 +1,38 @@
 module sigs.k8s.io/kustomize/functions/examples/validator-kubeval

-go 1.16
+go 1.18

 require (
 	github.com/instrumenta/kubeval v0.0.0-20190918223246-8d013ec9fc56
 	sigs.k8s.io/kustomize/kyaml v0.7.1
 )
+
+require (
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fatih/color v1.7.0 // indirect
+	github.com/go-errors/errors v1.0.1 // indirect
+	github.com/go-openapi/jsonpointer v0.19.3 // indirect
+	github.com/go-openapi/jsonreference v0.19.3 // indirect
+	github.com/go-openapi/spec v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.5 // indirect
+	github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357 // indirect
+	github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/mailru/easyjson v0.7.0 // indirect
+	github.com/mattn/go-colorable v0.1.0 // indirect
+	github.com/mattn/go-isatty v0.0.4 // indirect
+	github.com/spf13/cobra v1.0.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
+	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+	github.com/xeipuuv/gojsonschema v0.0.0-20180816142147-da425ebb7609 // indirect
+	github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
+	golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 // indirect
+	golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c // indirect
+	golang.org/x/text v0.3.2 // indirect
+	gopkg.in/yaml.v2 v2.3.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 // indirect
+	sigs.k8s.io/yaml v1.1.0 // indirect
+)
--- 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.13-stretch
+FROM golang:1.18-stretch
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY go.mod .
--- a/functions/examples/validator-resource-requests/image/go.mod
+++ b/functions/examples/validator-resource-requests/image/go.mod
@@ -1,5 +1,22 @@
 module sigs.k8s.io/kustomize/functions/examples/validator-resource-requests

-go 1.16
+go 1.18

 require sigs.k8s.io/kustomize/kyaml v0.7.1
+
+require (
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/go-errors/errors v1.0.1 // indirect
+	github.com/go-openapi/jsonpointer v0.19.3 // indirect
+	github.com/go-openapi/jsonreference v0.19.3 // indirect
+	github.com/go-openapi/spec v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.5 // indirect
+	github.com/mailru/easyjson v0.7.0 // indirect
+	github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
+	golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 // indirect
+	golang.org/x/text v0.3.2 // indirect
+	gopkg.in/yaml.v2 v2.3.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 // indirect
+)