Update Go to 1.20.4 in release 2.6.2. (#4903)

* Update Go to version 1.20.4. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix PR number. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Fix whitespace. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Update changelog entry. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> * Prepare for 2.6.2 release. Signed-off-by: Peter Štibraný <pstibrany@gmail.com> --------- Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
grafana · May 3, 2023 · cd6c269 · cd6c269
1 parent 5d3bdf6
commit cd6c269
Show file tree

Hide file tree

Showing 49 changed files with 386 additions and 378 deletions.
diff --git a/.github/workflows/compare-helm-with-jsonnet.yml b/.github/workflows/compare-helm-with-jsonnet.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-go@v3
       with:
-        go-version: '1.20.3'
+        go-version: '1.20.4'
     - uses: helm/kind-action@v1.2.0
     - name: Download yq
       uses: dsaltares/fetch-gh-release-asset@d9376dacd30fd38f49238586cd2e9295a8307f4c

diff --git a/.github/workflows/helm-ci.yml b/.github/workflows/helm-ci.yml
@@ -18,7 +18,7 @@ jobs:
   conftest:
     runs-on: ubuntu-latest
     container:
-      image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01
+      image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0
     steps:
       - name: Check out repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
@@ -20,7 +20,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     container:
-      image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01
+      image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
@@ -64,7 +64,7 @@ jobs:
   lint-jsonnet:
     runs-on: ubuntu-latest
     container:
-      image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01
+      image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
@@ -90,7 +90,7 @@ jobs:
   lint-helm:
     runs-on: ubuntu-latest
     container:
-      image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01
+      image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
@@ -119,7 +119,7 @@ jobs:
         test_group_id:    [0, 1, 2, 3]
         test_group_total: [4]
     container:
-      image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01
+      image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
@@ -154,7 +154,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01
+      image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
@@ -198,7 +198,7 @@ jobs:
       - name: Upgrade golang
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.3
+          go-version: 1.20.4
       - name: Check out repository
         uses: actions/checkout@v3
       - name: Run Git Config
@@ -244,7 +244,7 @@ jobs:
     if: (startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/r') ) && github.event_name == 'push' && github.repository == 'grafana/mimir'
     runs-on: ubuntu-latest
     container:
-      image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01
+      image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0
     steps:
       - name: Check out repository
         uses: actions/checkout@v3

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.6.2
+
+* [BUGFIX] Security: updates Go to version 1.20.4 to fix CVE-2023-24539, CVE-2023-24540, CVE-2023-29400. #4903
+
 ## 2.6.1
 
 ### Grafana Mimir

diff --git a/Makefile b/Makefile
@@ -198,7 +198,7 @@ mimir-build-image/$(UPTODATE): mimir-build-image/*
 # All the boiler plate for building golang follows:
 SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
 BUILD_IN_CONTAINER ?= true
-LATEST_BUILD_IMAGE_TAG ?= chore-upgrade-go-1203-5c4c29f01
+LATEST_BUILD_IMAGE_TAG ?= update-go-to-1.20.4-3f4099fd0
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.6.1
+2.6.2
diff --git a/development/mimir-microservices-mode/dev.dockerfile b/development/mimir-microservices-mode/dev.dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.3
+FROM golang:1.20.4
 ENV CGO_ENABLED=0
 RUN go install github.com/go-delve/delve/cmd/dlv@v1.20.2
 

diff --git a/development/mimir-read-write-mode/dev.dockerfile b/development/mimir-read-write-mode/dev.dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.3
+FROM golang:1.20.4
 ENV CGO_ENABLED=0
 RUN go install github.com/go-delve/delve/cmd/dlv@v1.20.2
 

diff --git a/docs/sources/mimir/release-notes/v2.6.md b/docs/sources/mimir/release-notes/v2.6.md
@@ -65,3 +65,7 @@ The following experimental options and features are now stable:
 ### 2.6.1
 
 - Security: updated the Go version to 1.20.3 to fix CVE-2023-24538. [PR 4798](https://github.com/grafana/mimir/pull/4798)
+
+### 2.6.2
+
+- Security: updated Go to version 1.20.4 to fix CVE-2023-24539, CVE-2023-24540, CVE-2023-29400. [PR 4903](https://github.com/grafana/mimir/pull/4903)
diff --git a/mimir-build-image/Dockerfile b/mimir-build-image/Dockerfile
@@ -5,7 +5,7 @@
 
 FROM k8s.gcr.io/kustomize/kustomize:v4.5.5 as kustomize
 FROM alpine/helm:3.11.1 as helm
-FROM golang:1.20.3-bullseye
+FROM golang:1.20.4-bullseye
 ARG goproxyValue
 ENV GOPROXY=${goproxyValue}
 ENV SKOPEO_DEPS="libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config"

diff --git a/operations/mimir-rules-action/Dockerfile b/operations/mimir-rules-action/Dockerfile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
-FROM grafana/mimirtool:2.6.1
+FROM grafana/mimirtool:2.6.2
 
 COPY entrypoint.sh /entrypoint.sh
 

diff --git a/operations/mimir-tests/test-autoscaling-generated.yaml b/operations/mimir-tests/test-autoscaling-generated.yaml
@@ -492,7 +492,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=distributor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -584,7 +584,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1024"
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -658,7 +658,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-frontend
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -729,7 +729,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -813,7 +813,7 @@ spec:
         - -store-gateway.sharding-ring.store=memberlist
         - -target=ruler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -905,7 +905,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1024"
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: ruler-querier
         ports:
@@ -979,7 +979,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-frontend
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: ruler-query-frontend
         ports:
@@ -1050,7 +1050,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: ruler-query-scheduler
         ports:
@@ -1118,7 +1118,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1214,7 +1214,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1317,7 +1317,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1646,7 +1646,7 @@ spec:
         - -store-gateway.sharding-ring.wait-stability-min-duration=1m
         - -target=store-gateway
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports:

diff --git a/operations/mimir-tests/test-consul-generated.yaml b/operations/mimir-tests/test-consul-generated.yaml
@@ -787,7 +787,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=distributor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: distributor
         ports:
@@ -877,7 +877,7 @@ spec:
         env:
         - name: JAEGER_REPORTER_MAX_QUEUE_SIZE
           value: "1024"
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: querier
         ports:
@@ -949,7 +949,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-frontend
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: query-frontend
         ports:
@@ -1020,7 +1020,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=query-scheduler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: query-scheduler
         ports:
@@ -1103,7 +1103,7 @@ spec:
         - -store-gateway.sharding-ring.store=consul
         - -target=ruler
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: ruler
         ports:
@@ -1178,7 +1178,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: alertmanager
         ports:
@@ -1270,7 +1270,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=compactor
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: compactor
         ports:
@@ -1369,7 +1369,7 @@ spec:
         - -server.http-listen-port=8080
         - -target=ingester
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: ingester
         ports:
@@ -1694,7 +1694,7 @@ spec:
         - -store-gateway.sharding-ring.wait-stability-min-duration=1m
         - -target=store-gateway
         - -usage-stats.installation-mode=jsonnet
-        image: grafana/mimir:2.6.1
+        image: grafana/mimir:2.6.2
         imagePullPolicy: IfNotPresent
         name: store-gateway
         ports: