From 83dd5e4e7273c6f8e15a0b938bfd7654ef5605ee Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@victoriametrics.com>
Date: Fri, 10 Nov 2023 22:28:31 +0100
Subject: [PATCH] deployment: update Go builder from Go1.21.3 to Go1.21.4

See https://github.com/golang/go/issues?q=milestone%3AGo1.21.4+label%3ACherryPickApproved
---
 .github/workflows/check-licenses.yml  | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/main.yml            | 6 +++---
 app/vmui/Dockerfile-web               | 2 +-
 deployment/docker/Makefile            | 2 +-
 docs/CHANGELOG.md                     | 2 ++
 snap/local/Makefile                   | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
index 28852f836..52af9c352 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.21.3
+          go-version: 1.21.4
         id: go
       - name: Code checkout
         uses: actions/checkout@master
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 58f08a96a..80a3e591b 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@v4
         with:
-          go-version: 1.21.3
+          go-version: 1.21.4
           check-latest: true
           cache: true
         if: ${{ matrix.language == 'go' }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6ec993962..f94f598a4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.3
+          go-version: 1.21.4
           check-latest: true
           cache: true
 
@@ -56,7 +56,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.3
+          go-version: 1.21.4
           check-latest: true
           cache: true
 
@@ -81,7 +81,7 @@ jobs:
         id: go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21.3
+          go-version: 1.21.4
           check-latest: true
           cache: true
 
diff --git a/app/vmui/Dockerfile-web b/app/vmui/Dockerfile-web
index 687a3cc6a..0626f2f78 100644
--- a/app/vmui/Dockerfile-web
+++ b/app/vmui/Dockerfile-web
@@ -1,4 +1,4 @@
-FROM golang:1.21.3 as build-web-stage
+FROM golang:1.21.4 as build-web-stage
 COPY build /build
 
 WORKDIR /build
diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile
index fbaaa61e5..41108154c 100644
--- a/deployment/docker/Makefile
+++ b/deployment/docker/Makefile
@@ -5,7 +5,7 @@ DOCKER_NAMESPACE ?= victoriametrics
 ROOT_IMAGE ?= alpine:3.18.4
 CERTS_IMAGE := alpine:3.18.4
 
-GO_BUILDER_IMAGE := golang:1.21.3-alpine
+GO_BUILDER_IMAGE := golang:1.21.4-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 :/ __)
 DOCKER_BUILD ?= docker build
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 35b1c1884..5eddc1330 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -11,6 +11,8 @@ The following `tip` changes can be tested by building VictoriaMetrics components
 
 ## v1.93.x long-time support release (LTS)
 
+* SECURITY: upgrade Go builder from Go1.21.3 to Go1.21.4. See [the list of issues addressed in Go1.21.4](https://github.com/golang/go/issues?q=milestone%3AGo1.21.4+label%3ACherryPickApproved).
+
 * BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): properly apply [relabeling](https://docs.victoriametrics.com/vmagent.html#relabeling) with `regex`, which start and end with `.+` or `.*` and which contain alternate sub-regexps. For example, `.+;|;.+` or `.*foo|bar|baz.*`. Previously such regexps were improperly parsed, which could result in undexpected relabeling results. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5297).
 
 ## [v1.93.7](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.93.7)
diff --git a/snap/local/Makefile b/snap/local/Makefile
index a1600157c..d315871b5 100644
--- a/snap/local/Makefile
+++ b/snap/local/Makefile
@@ -1,4 +1,4 @@
-GO_VERSION ?=1.21.3
+GO_VERSION ?=1.21.4
 SNAP_BUILDER_IMAGE := local/snap-builder:2.0.0-$(shell echo $(GO_VERSION) | tr :/ __)