From ddfa077df8b07b6f569c983fc047d9f914e4c21c Mon Sep 17 00:00:00 2001
From: Paulo Gomes <paulo.gomes@weave.works>
Date: Wed, 6 Jul 2022 14:50:01 +0100
Subject: [PATCH] build: Upgrade to Go 1.18

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
---
 .github/workflows/e2e.yaml | 2 +-
 Dockerfile                 | 2 +-
 Makefile                   | 4 ++--
 api/go.mod                 | 2 +-
 go.mod                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 7454d7249..af478cf08 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -41,7 +41,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17.x
+          go-version: 1.18.x
       - name: Setup Kubernetes
         uses: engineerd/setup-kind@v0.5.0
         with:
diff --git a/Dockerfile b/Dockerfile
index c4c93aa44..6a424a651 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.17
+ARG GO_VERSION=1.18
 ARG XX_VERSION=1.1.0
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
diff --git a/Makefile b/Makefile
index 72ba531f5..6e73c4999 100644
--- a/Makefile
+++ b/Makefile
@@ -76,8 +76,8 @@ api-docs: gen-crd-api-reference-docs
 
 # Run go mod tidy
 tidy:
-	cd api; rm -f go.sum; go mod tidy -compat=1.17
-	rm -f go.sum; go mod tidy -compat=1.17
+	cd api; rm -f go.sum; go mod tidy -compat=1.18
+	rm -f go.sum; go mod tidy -compat=1.18
 
 # Run go fmt against code
 fmt:
diff --git a/api/go.mod b/api/go.mod
index 946b14060..692dfe76a 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/notification-controller/api
 
-go 1.17
+go 1.18
 
 require (
 	github.com/fluxcd/pkg/apis/meta v0.14.2
diff --git a/go.mod b/go.mod
index b8420e246..8c82ed409 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/fluxcd/notification-controller
 
-go 1.17
+go 1.18
 
 replace github.com/fluxcd/notification-controller/api => ./api