up go to 1.20 (#835)

bwagner5 · web-flow · commit 6f82bf8adf26 · 2023-06-06T15:08:43.000-05:00
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -13,7 +13,7 @@ on:
     - cron: '0 19 * * 1-5'
 
 env:
-  DEFAULT_GO_VERSION: ^1.19.3
+  DEFAULT_GO_VERSION: ^1.20.4
   GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }}
   GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }}
   WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -9,7 +9,7 @@ permissions:
   contents: write # required for uploading releases
 
 env:
-  DEFAULT_GO_VERSION: ^1.19.3
+  DEFAULT_GO_VERSION: ^1.20.4
   GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }}
   GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }}
   WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.19 as builder
+FROM --platform=$BUILDPLATFORM golang:1.20 as builder
 
 ## GOLANG env
 ARG GOPROXY="https://proxy.golang.org|direct"
diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -1,7 +1,7 @@
 ARG WINDOWS_VERSION=1809
 
 # Build the manager binary
-FROM --platform=windows/amd64 golang:1.19 as builder
+FROM --platform=windows/amd64 golang:1.20 as builder
 
 ## GOLANG env
 ENV GO111MODULE="on" CGO_ENABLED="0" GOOS="windows" GOARCH="amd64"
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
   <a href="https://github.com/kubernetes/kubernetes/releases">
     <img src="https://img.shields.io/badge/Kubernetes-%3E%3D%201.22-brightgreen" alt="kubernetes">
   </a>
-  <a href="https://golang.org/doc/go1.19">
+  <a href="https://golang.org/doc/go1.20">
     <img src="https://img.shields.io/github/go-mod/go-version/aws/aws-node-termination-handler?color=blueviolet" alt="go-version">
   </a>
   <a href="https://opensource.org/licenses/Apache-2.0">
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/aws/aws-node-termination-handler
 
-go 1.19
+go 1.20
 
 require (
 	github.com/Masterminds/sprig/v3 v3.2.3
diff --git a/test/readme-test/spellcheck-Dockerfile b/test/readme-test/spellcheck-Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19
+FROM golang:1.20
 
 RUN go install github.com/client9/misspell/cmd/misspell@v0.3.4
 
diff --git a/test/webhook-test-proxy/Dockerfile b/test/webhook-test-proxy/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19-alpine as builder
+FROM golang:1.20-alpine as builder
 
 ## GOLANG env
 ARG GOPROXY="https://proxy.golang.org|direct"
diff --git a/test/webhook-test-proxy/Dockerfile.windows b/test/webhook-test-proxy/Dockerfile.windows
@@ -1,7 +1,7 @@
 ARG WINDOWS_VERSION=1903
 
 # Build the manager binary
-FROM --platform=windows/amd64 golang:1.19 AS builder
+FROM --platform=windows/amd64 golang:1.20 AS builder
 
 ## GOLANG env
 ENV GO111MODULE="on" CGO_ENABLED="0" GOOS="windows" GOARCH="amd64"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM --platform=$BUILDPLATFORM golang:1.19 as builder`
	`1`	`+FROM --platform=$BUILDPLATFORM golang:1.20 as builder`
`2`	`2`
`3`	`3`	`## GOLANG env`
`4`	`4`	`ARG GOPROXY="https://proxy.golang.org\|direct"`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 module github.com/aws/aws-node-termination-handler
 -go 1.19
 +go 1.20
 require (
 	github.com/Masterminds/sprig/v3 v3.2.3
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.19`
	`1`	`+FROM golang:1.20`
`2`	`2`
`3`	`3`	`RUN go install github.com/client9/misspell/cmd/[email protected]`
`4`	`4`