From 97dd7e26ad1a65a48a514dc8840b187d6699c488 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Wed, 6 Mar 2024 21:04:09 +0200 Subject: [PATCH] deployment/docker: update Go builder from Go1.21.7 to Go1.22.1 See https://github.com/golang/go/issues?q=milestone%3AGo1.22.1+label%3ACherryPickApproved --- app/vmui/Dockerfile-web | 2 +- deployment/docker/Makefile | 4 ++-- deployment/logs-benchmark/docker-compose-elk.yml | 2 +- deployment/logs-benchmark/docker-compose-loki.yml | 2 +- docs/CHANGELOG.md | 2 ++ snap/local/Makefile | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/vmui/Dockerfile-web b/app/vmui/Dockerfile-web index 522bd7d813..8b83a8beb5 100644 --- a/app/vmui/Dockerfile-web +++ b/app/vmui/Dockerfile-web @@ -1,4 +1,4 @@ -FROM golang:1.21.7 as build-web-stage +FROM golang:1.22.1 as build-web-stage COPY build /build WORKDIR /build diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index 5e8d90cc70..6c5b09baa8 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -5,7 +5,7 @@ DOCKER_NAMESPACE ?= victoriametrics ROOT_IMAGE ?= alpine:3.19.1 CERTS_IMAGE := alpine:3.19.1 -GO_BUILDER_IMAGE := golang:1.21.7-alpine +GO_BUILDER_IMAGE := golang:1.22.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 ?= docker @@ -209,4 +209,4 @@ docker-victorialogs-up: $(DOCKER_COMPOSE) -f deployment/docker/docker-compose-victorialogs.yml up -d docker-victorialogs-down: - $(DOCKER_COMPOSE) -f deployment/docker/docker-compose-victorialogs.yml down -v \ No newline at end of file + $(DOCKER_COMPOSE) -f deployment/docker/docker-compose-victorialogs.yml down -v diff --git a/deployment/logs-benchmark/docker-compose-elk.yml b/deployment/logs-benchmark/docker-compose-elk.yml index bf15a67f24..5adff54959 100644 --- a/deployment/logs-benchmark/docker-compose-elk.yml +++ b/deployment/logs-benchmark/docker-compose-elk.yml @@ -18,7 +18,7 @@ services: - vlogs generator: - image: golang:1.21.7-alpine + image: golang:1.22.1-alpine restart: always working_dir: /go/src/app volumes: diff --git a/deployment/logs-benchmark/docker-compose-loki.yml b/deployment/logs-benchmark/docker-compose-loki.yml index d80009ca28..7fa88ba130 100644 --- a/deployment/logs-benchmark/docker-compose-loki.yml +++ b/deployment/logs-benchmark/docker-compose-loki.yml @@ -2,7 +2,7 @@ version: '3' services: generator: - image: golang:1.21.7-alpine + image: golang:1.22.1-alpine restart: always working_dir: /go/src/app volumes: diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 81eeeaaff6..c6223dd76d 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -30,6 +30,8 @@ See also [LTS releases](https://docs.victoriametrics.com/lts-releases/). ## tip +* SECURITY: upgrade Go builder from Go1.21.7 to Go1.22.1. See [the list of issues addressed in Go1.22.1](https://github.com/golang/go/issues?q=milestone%3AGo1.22.1+label%3ACherryPickApproved). + * FEATURE: [vmauth](https://docs.victoriametrics.com/vmauth/): allow routing incoming requests bassed on HTTP [query args](https://en.wikipedia.org/wiki/Query_string) via `src_query_args` option at `url_map`. See [these docs](https://docs.victoriametrics.com/vmauth/#generic-http-proxy-for-different-backends) and [this feature request](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5878). * FEATURE: [stream aggregation](https://docs.victoriametrics.com/stream-aggregation/): reduce memory usage by up to 5x when aggregating over big number of unique [time series](https://docs.victoriametrics.com/keyconcepts/#time-series). The memory usage reduction is most visible when [stream deduplication](https://docs.victoriametrics.com/stream-aggregation/#deduplication) is enabled. The downside is increased CPU usage by up to 30%. * FEATURE: [stream aggregation](https://docs.victoriametrics.com/stream-aggregation/): allow using `-streamAggr.dedupInterval` and `-remoteWrite.streamAggr.dedupInterval` command-line flags without the need to specify `-streamAggr.config` and `-remoteWrite.streamAggr.config`. See [these docs](https://docs.victoriametrics.com/stream-aggregation/#deduplication). diff --git a/snap/local/Makefile b/snap/local/Makefile index 184740be17..fbc2eff2eb 100644 --- a/snap/local/Makefile +++ b/snap/local/Makefile @@ -1,4 +1,4 @@ -GO_VERSION ?= 1.21.7 +GO_VERSION ?= 1.22.1 SNAP_BUILDER_IMAGE := local/snap-builder:2.0.0-$(shell echo $(GO_VERSION) | tr :/ __)