From 6f82bf8adf26d250a2c90d7e23628715a6c75c41 Mon Sep 17 00:00:00 2001
From: Brandon Wagner <wagnerbm@amazon.com>
Date: Tue, 6 Jun 2023 15:08:43 -0500
Subject: [PATCH] up go to 1.20 (#835)

---
 .github/workflows/build-and-test.yaml      | 2 +-
 .github/workflows/release.yaml             | 2 +-
 Dockerfile                                 | 2 +-
 Dockerfile.windows                         | 2 +-
 README.md                                  | 2 +-
 go.mod                                     | 2 +-
 test/readme-test/spellcheck-Dockerfile     | 2 +-
 test/webhook-test-proxy/Dockerfile         | 2 +-
 test/webhook-test-proxy/Dockerfile.windows | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index b86f3a86..c8c00a19 100755
--- 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
index db2723dc..1f1ede70 100755
--- 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
index 3c57a0f8..4fddcf5e 100644
--- 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
index 6987bac1..77fb9165 100644
--- 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
index 0c3437b2..36ad5339 100644
--- 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
index b227252b..5fc70a0f 100644
--- 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
index 89809b1f..e88b059d 100644
--- 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
index 4463e97e..fd099cfb 100644
--- 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
index a9c181f8..885b1527 100644
--- 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"