From 3a3349e53aae4e4182c6fbebcf3c5f14bd200ee1 Mon Sep 17 00:00:00 2001 From: Zbynek Roubalik Date: Tue, 12 Oct 2021 14:03:37 +0200 Subject: [PATCH 1/3] bump Golang to 1.16.9 Signed-off-by: Zbynek Roubalik --- .devcontainer/Dockerfile | 2 +- Dockerfile | 2 +- Dockerfile.adapter | 2 +- tools/build-tools.Dockerfile | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index afba78fa7cc..1e2c339bdd7 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.16.7 +FROM golang:1.16.9 # Avoid warnings by switching to noninteractive ENV DEBIAN_FRONTEND=noninteractive diff --git a/Dockerfile b/Dockerfile index 91d6427112e..0f2895f8c99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.16.7 as builder +FROM golang:1.16.9 as builder ARG BUILD_VERSION=main ARG GIT_COMMIT=HEAD diff --git a/Dockerfile.adapter b/Dockerfile.adapter index 2dddc417de2..1e4becb6ee5 100644 --- a/Dockerfile.adapter +++ b/Dockerfile.adapter @@ -1,5 +1,5 @@ # Build the adapter binary -FROM golang:1.16.7 as builder +FROM golang:1.16.9 as builder ARG BUILD_VERSION=main ARG GIT_COMMIT=HEAD diff --git a/tools/build-tools.Dockerfile b/tools/build-tools.Dockerfile index 54cc9a1907c..3c2e2666f7d 100644 --- a/tools/build-tools.Dockerfile +++ b/tools/build-tools.Dockerfile @@ -29,9 +29,9 @@ RUN curl -LO https://download.docker.com/linux/static/stable/x86_64/docker-19.03 rm -rf docker docker-19.03.2.tgz # Install golang -RUN GO_VERSION=1.16.7 && \ +RUN GO_VERSION=1.16.9 && \ curl -LO https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz && \ - go_sha256=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04 && \ + go_sha256=d2c095c95f63c2a3ef961000e0ecb9d81d5c68b6ece176e2a8a2db82dc02931c && \ echo "$go_sha256 go${GO_VERSION}.linux-amd64.tar.gz" | sha256sum -c - && \ tar -C /usr/local -xvzf go${GO_VERSION}.linux-amd64.tar.gz && \ rm -rf go${GO_VERSION}.linux-amd64.tar.gz From a08e6f7eb1e3cd6b4c551d60e320c084966ffcb1 Mon Sep 17 00:00:00 2001 From: Zbynek Roubalik Date: Tue, 12 Oct 2021 14:04:52 +0200 Subject: [PATCH 2/3] update changelog Signed-off-by: Zbynek Roubalik --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d706e8321f9..a419db3b173 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,7 +53,7 @@ - Migrate to Kubebuilder v3 ([#2082](https://github.com/kedacore/keda/pull/2082)) - API path has been changed: `github.com/kedacore/keda/v2/api/v1alpha1` -> `github.com/kedacore/keda/v2/apis/keda/v1alpha1` - 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)) +- Bump Golang to 1.16.9 ([#2065](https://github.com/kedacore/keda/pull/2065)|[#2186](https://github.com/kedacore/keda/issues/2186)) - Add Makefile mockgen targets ([#2090](https://github.com/kedacore/keda/issues/2090)) ## v2.4.0 From 622ccabe65ab5684e297b3a4800f1233e95007dc Mon Sep 17 00:00:00 2001 From: Zbynek Roubalik Date: Tue, 12 Oct 2021 14:05:08 +0200 Subject: [PATCH 3/3] fix Signed-off-by: Zbynek Roubalik --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a419db3b173..e00971cf1ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,7 +53,7 @@ - Migrate to Kubebuilder v3 ([#2082](https://github.com/kedacore/keda/pull/2082)) - API path has been changed: `github.com/kedacore/keda/v2/api/v1alpha1` -> `github.com/kedacore/keda/v2/apis/keda/v1alpha1` - Use Patch to set FallbackCondition on ScaledObject.Status ([#2037](https://github.com/kedacore/keda/pull/2037)) -- Bump Golang to 1.16.9 ([#2065](https://github.com/kedacore/keda/pull/2065)|[#2186](https://github.com/kedacore/keda/issues/2186)) +- Bump Golang to 1.16.9 ([#2065](https://github.com/kedacore/keda/pull/2065)|[#2186](https://github.com/kedacore/keda/pull/2186)) - Add Makefile mockgen targets ([#2090](https://github.com/kedacore/keda/issues/2090)) ## v2.4.0