From 2db1a664e14a72f2396e7ec069d12c54b0349310 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin 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 +- deployment/logs-benchmark/docker-compose-elk.yml | 2 +- deployment/logs-benchmark/docker-compose-loki.yml | 2 +- docs/CHANGELOG.md | 2 +- snap/local/Makefile | 2 +- 9 files changed, 11 insertions(+), 11 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 ab7e324a1..20152ba97 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 a0d88242b..88dead7cd 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 c7994bce9..59dcc5292 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 ?= docker diff --git a/deployment/logs-benchmark/docker-compose-elk.yml b/deployment/logs-benchmark/docker-compose-elk.yml index 0b96af053..8362cf9ed 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.3-alpine + image: golang:1.21.4-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 231884052..c8eb14845 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.3-alpine + image: golang:1.21.4-alpine restart: always working_dir: /go/src/app volumes: diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 612625beb..a7bd0e0c6 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -31,7 +31,7 @@ The sandbox cluster installation is running under the constant load generated by **vmalert's cmd-line flag `datasource.queryTimeAlignment` was deprecated and will have no effect anymore. It will be completely removed in next releases. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5049) and more detailed changes below.** **vmalert's cmd-line flag `datasource.lookback` will be deprecated soon. Please use `-rule.evalDelay` command-line flag instead. It will have no effect in next release and be removed in future releases. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5155).** -* SECURITY: upgrade Go builder from Go1.21.1 to Go1.21.3. See [the list of issues addressed in Go1.21.2](https://github.com/golang/go/issues?q=milestone%3AGo1.21.2+label%3ACherryPickApproved) and [the list of issues addressed in Go1.21.3](https://github.com/golang/go/issues?q=milestone%3AGo1.21.3+label%3ACherryPickApproved). +* SECURITY: upgrade Go builder from Go1.21.1 to Go1.21.4. See [the list of issues addressed in Go1.21.2](https://github.com/golang/go/issues?q=milestone%3AGo1.21.2+label%3ACherryPickApproved), [the list of issues addressed in Go1.21.3](https://github.com/golang/go/issues?q=milestone%3AGo1.21.3+label%3ACherryPickApproved) and [the list of issues addressed in Go1.21.4](https://github.com/golang/go/issues?q=milestone%3AGo1.21.4+label%3ACherryPickApproved). * FEATURE: `vmselect`: improve performance for repeated [instant queries](https://docs.victoriametrics.com/keyConcepts.html#instant-query) if they contain one of the following [rollup functions](https://docs.victoriametrics.com/MetricsQL.html#rollup-functions): - [avg_over_time](https://docs.victoriametrics.com/MetricsQL.html#avg_over_time) 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 :/ __)