From 041a6369e7fd2f2023a63d07d10aa81ac14ebbe2 Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@victoriametrics.com>
Date: Sat, 12 Aug 2023 08:31:16 -0700
Subject: [PATCH] Upgrade Go builder from 1.20.4 to 1.21.0

---
 .github/workflows/check-licenses.yml  | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/main.yml            | 6 +++---
 .github/workflows/nightly-build.yml   | 2 +-
 app/vmui/Dockerfile-web               | 2 +-
 deployment/docker/Makefile            | 2 +-
 docs/CHANGELOG.md                     | 1 +
 snap/local/Makefile                   | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
index df1ec0106..70d3e87f7 100644
--- a/.github/workflows/check-licenses.yml
+++ b/.github/workflows/check-licenses.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@main
         with:
-          go-version: 1.20.4
+          go-version: 1.21.0
         id: go
       - name: Code checkout
         uses: actions/checkout@master
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ae1cea5b4..859a36be1 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -57,7 +57,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.4
+          go-version: 1.21.0
           check-latest: true
           cache: true
         if: ${{ matrix.language == 'go' }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5fcab9c3f..d7c6be3d8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.4
+          go-version: 1.21.0
           check-latest: true
           cache: true
 
@@ -56,7 +56,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.4
+          go-version: 1.21.0
           check-latest: true
           cache: true
 
@@ -81,7 +81,7 @@ jobs:
         id: go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.4
+          go-version: 1.21.0
           check-latest: true
           cache: true
 
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 2d03103f6..c8ca5026d 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@main
         with:
-          go-version: 1.20.4
+          go-version: 1.21.0
         id: go
 
       - name: Setup docker scan
diff --git a/app/vmui/Dockerfile-web b/app/vmui/Dockerfile-web
index 8bb1c5241..82b253c7c 100644
--- a/app/vmui/Dockerfile-web
+++ b/app/vmui/Dockerfile-web
@@ -1,4 +1,4 @@
-FROM golang:1.20.4 as build-web-stage
+FROM golang:1.21.0 as build-web-stage
 COPY build /build
 
 WORKDIR /build
diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile
index 5de99e2c2..eed56d34f 100644
--- a/deployment/docker/Makefile
+++ b/deployment/docker/Makefile
@@ -5,7 +5,7 @@ DOCKER_NAMESPACE := victoriametrics
 ROOT_IMAGE ?= alpine:3.18.3
 CERTS_IMAGE := alpine:3.18.3
 
-GO_BUILDER_IMAGE := golang:1.20.4-alpine
+GO_BUILDER_IMAGE := golang:1.21.0-alpine
 BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr :/ __)-1
 BASE_IMAGE := local/base:1.1.4-$(shell echo $(ROOT_IMAGE) | tr :/ __)-$(shell echo $(CERTS_IMAGE) | tr :/ __)
 
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 9a0bed57e..3265f684a 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -15,6 +15,7 @@ The following tip changes can be tested by building VictoriaMetrics components f
 
 ## v1.87.x long-time support release (LTS)
 
+* SECURITY: upgrade Go builder from Go1.20.4 to Go1.21.0.
 * SECURITY: upgrade base docker image (Alpine) from 3.18.2 to 3.18.3. See [alpine 3.18.3 release notes](https://alpinelinux.org/posts/Alpine-3.15.10-3.16.7-3.17.5-3.18.3-released.html).
 
 * BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): properly apply `if` filters during [relabeling](https://docs.victoriametrics.com/vmagent.html#relabeling-enhancements). Previously the `if` filter could improperly work. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4806) and [this pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/4816).
diff --git a/snap/local/Makefile b/snap/local/Makefile
index c8c39621e..c196e36cb 100644
--- a/snap/local/Makefile
+++ b/snap/local/Makefile
@@ -1,4 +1,4 @@
-GO_VERSION ?=1.20.4
+GO_VERSION ?=1.21.0
 SNAP_BUILDER_IMAGE := local/snap-builder:2.0.0-$(shell echo $(GO_VERSION) | tr :/ __)