summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com>2022-05-13 09:31:49 -0700
committerGitHub <noreply@github.com>2022-05-13 09:31:49 -0700
commitd858f930aaa1b581af34ba3fa4cc4d65c25e154e (patch)
tree4ff72324838303c56842c29f79ee9dea163c2f12
parentfe1f9d5609e4c38a4ed3cd6561fee7cb1a5fe73e (diff)
parentcdbf1b8f58bc896494b040a665ec0d6b8a6c1a7b (diff)
Merge pull request #6650 from JohnTitor/update-go
Update Go version to 1.18
-rw-r--r--Makefile5
-rw-r--r--go.mod2
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index b714c60f..f3e22bf6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
-IMAGE_NAME=golang:1.12
-export GO111MODULE=on
+IMAGE_NAME=golang:1.18
export GOPROXY?=https://proxy.golang.org
default: \
@@ -12,7 +11,7 @@ generate:
go run ./generator/app.go
generate-dockerized:
- docker run --rm -e WHAT -e GO111MODULE -e GOPROXY -v $(shell pwd):/go/src/app:Z $(IMAGE_NAME) make -C /go/src/app generate
+ docker run --rm -e WHAT -e GOPROXY -v $(shell pwd):/go/src/app:Z $(IMAGE_NAME) make -C /go/src/app generate
verify:
@hack/verify.sh
diff --git a/go.mod b/go.mod
index e611b138..be491393 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module k8s.io/community
-go 1.15
+go 1.18
require (
github.com/client9/misspell v0.3.4