From ed2484ecfa8805a78fbe914ecb5c361192c2d0a4 Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@victoriametrics.com>
Date: Thu, 7 Sep 2023 11:34:29 +0200
Subject: [PATCH] all: update Go builder from Go1.21.0 to Go1.21.1
See https://github.com/golang/go/issues?q=milestone%3AGo1.21.1+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 | 14 ++------------
snap/local/Makefile | 2 +-
7 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
index 70d3e87f7a..a904b2562b 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.0
+ go-version: 1.21.1
id: go
- name: Code checkout
uses: actions/checkout@master
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 73ef32c3df..a302989243 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.0
+ go-version: 1.21.1
check-latest: true
cache: true
if: ${{ matrix.language == 'go' }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 268033ca91..ba27db9e83 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.0
+ go-version: 1.21.1
check-latest: true
cache: true
@@ -56,7 +56,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
- go-version: 1.21.0
+ go-version: 1.21.1
check-latest: true
cache: true
@@ -81,7 +81,7 @@ jobs:
id: go
uses: actions/setup-go@v4
with:
- go-version: 1.21.0
+ go-version: 1.21.1
check-latest: true
cache: true
diff --git a/app/vmui/Dockerfile-web b/app/vmui/Dockerfile-web
index 2c03eb2c2e..6c5663ede8 100644
--- a/app/vmui/Dockerfile-web
+++ b/app/vmui/Dockerfile-web
@@ -1,4 +1,4 @@
-FROM golang:1.21.0 as build-web-stage
+FROM golang:1.21.1 as build-web-stage
COPY build /build
WORKDIR /build
diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile
index d98eb458de..a906d369e7 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.21.0-alpine
+GO_BUILDER_IMAGE := golang:1.21.1-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 144a978166..ebf9c4922e 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,15 +1,3 @@
----
-sort: 16
-weight: 16
-title: CHANGELOG
-menu:
- docs:
- parent: "victoriametrics"
- weight: 16
-aliases:
-- /CHANGELOG.html
----
-
# CHANGELOG
The following `tip` changes can be tested by building VictoriaMetrics components from the latest commits according to the following docs:
@@ -24,6 +12,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.0 to Go1.21.1. See [the list of issues addressed in Go1.20.6](https://github.com/golang/go/issues?q=milestone%3AGo1.21.1+label%3ACherryPickApproved).
+
* BUGFIX: [vminsert enterprise](https://docs.victoriametrics.com/enterprise.html): properly parse `/insert/multitenant/*` urls, which have been broken since [v1.93.2](#v1932). See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4947).
* BUGFIX: properly build production armv5 binaries for `GOARCH=arm`. This has been broken after the upgrading of Go builder to Go1.21.0. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4965).
diff --git a/snap/local/Makefile b/snap/local/Makefile
index 898a0368b6..3bc0c93a93 100644
--- a/snap/local/Makefile
+++ b/snap/local/Makefile
@@ -1,4 +1,4 @@
-GO_VERSION ?=1.21.0
+GO_VERSION ?=1.21.1
SNAP_BUILDER_IMAGE := local/snap-builder:2.0.0-$(shell echo $(GO_VERSION) | tr :/ __)