From 58362e61549ef25c09ad2d87fa9a38c956ac883b Mon Sep 17 00:00:00 2001
From: Zbynek Roubalik <726523+zroubalik@users.noreply.github.com>
Date: Wed, 1 Sep 2021 10:45:14 +0200
Subject: [PATCH] bump Golang to 1.16.7 (#2065)

Signed-off-by: Zbynek Roubalik <zroubali@redhat.com>
---
 .devcontainer/Dockerfile                          | 2 +-
 .github/workflows/fossa.yml                       | 2 +-
 .github/workflows/pr-validation.yml               | 2 +-
 CHANGELOG.md                                      | 1 +
 Dockerfile                                        | 2 +-
 Dockerfile.adapter                                | 2 +-
 adapter/generated/openapi/zz_generated.openapi.go | 1 +
 api/v1alpha1/zz_generated.deepcopy.go             | 6 ++++++
 go.mod                                            | 2 +-
 hack/tools.go                                     | 1 +
 10 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 45bd9b49956..091101dc836 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM golang:1.15.13
+FROM golang:1.16.7
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
index cb91fe4c0ae..12e61d097b7 100644
--- a/.github/workflows/fossa.yml
+++ b/.github/workflows/fossa.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "^1.15.13"
+          go-version: "^1.16"
       - run: go version
       # Runs a set of commands to initialize and analyze with FOSSA
       - name: run FOSSA analysis
diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
index fd3fec4cbf6..2f84a5e780b 100644
--- a/.github/workflows/pr-validation.yml
+++ b/.github/workflows/pr-validation.yml
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/setup-python@v2.2.2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.15.13
+          go-version: 1.16
       - name: Get golangci
         run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.42.0
       - uses: pre-commit/action@v2.0.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 857c2e43845..5ec0d1b19e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
 ### Other
 
 - Use Patch to set FallbackCondition on ScaledObject.Status ([#2037](https://github.com/kedacore/keda/pull/2037))
+- Bump Golang to 1.16.7 ([#2065](https://github.com/kedacore/keda/pull/2065))
 
 ## v2.4.0
 
diff --git a/Dockerfile b/Dockerfile
index 0bfd400935b..d38d2cea688 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.15.13 as builder
+FROM golang:1.16.7 as builder
 
 ARG BUILD_VERSION=main
 ARG GIT_COMMIT=HEAD
diff --git a/Dockerfile.adapter b/Dockerfile.adapter
index 8047405601a..1cd53e3a80e 100644
--- a/Dockerfile.adapter
+++ b/Dockerfile.adapter
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.15.13 as builder
+FROM golang:1.16.7 as builder
 
 ARG BUILD_VERSION=main
 ARG GIT_COMMIT=HEAD
diff --git a/adapter/generated/openapi/zz_generated.openapi.go b/adapter/generated/openapi/zz_generated.openapi.go
index 50063adbf73..ec20f28d07e 100644
--- a/adapter/generated/openapi/zz_generated.openapi.go
+++ b/adapter/generated/openapi/zz_generated.openapi.go
@@ -1,3 +1,4 @@
+//go:build !autogenerated
 // +build !autogenerated
 
 /*
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
index e0492ae784c..e50e45dcb45 100644
--- a/api/v1alpha1/zz_generated.deepcopy.go
+++ b/api/v1alpha1/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 /*
@@ -666,6 +667,11 @@ func (in *ScalingStrategy) DeepCopyInto(out *ScalingStrategy) {
 		*out = new(int32)
 		**out = **in
 	}
+	if in.PendingPodConditions != nil {
+		in, out := &in.PendingPodConditions, &out.PendingPodConditions
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScalingStrategy.
diff --git a/go.mod b/go.mod
index aac6e220d3d..8226a008322 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/kedacore/keda/v2
 
-go 1.15
+go 1.16
 
 require (
 	cloud.google.com/go v0.86.0
diff --git a/hack/tools.go b/hack/tools.go
index e1b0f44c394..ccbda851f38 100644
--- a/hack/tools.go
+++ b/hack/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 // Package tools imports things required by build scripts, to force `go mod` to see them as dependencies