Upgrade alpine, go, and github.com/Azure/azure-sdk-for-go/sdk/azident…

…ity (cortexproject#6014) * Upgrade alpine, go, and github.com/Azure/azure-sdk-for-go/sdk/azidentity Signed-off-by: Daniel Sabsay <[email protected]> * update CHANGELOG Signed-off-by: Daniel Sabsay <[email protected]> * update build-image and go-version Signed-off-by: Daniel Sabsay <[email protected]> --------- Signed-off-by: Daniel Sabsay <[email protected]> Co-authored-by: Daniel Sabsay <[email protected]>
eeldaly · Jun 26, 2024 · 31e5360 · 31e5360
1 parent 5b07a53
commit 31e5360
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
@@ -17,7 +17,7 @@ jobs:
   lint:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:master-6dd64fcce
+      image: quay.io/cortexproject/build-image:master-2866917df
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -46,7 +46,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:master-6dd64fcce
+      image: quay.io/cortexproject/build-image:master-2866917df
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -89,7 +89,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:master-6dd64fcce
+      image: quay.io/cortexproject/build-image:master-2866917df
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -148,7 +148,7 @@ jobs:
       - name: Upgrade golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.21.9
+          go-version: 1.21.11
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Install Docker Client
@@ -223,14 +223,14 @@ jobs:
         run: |
           touch build-image/.uptodate
           MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
-          make BUILD_IMAGE=quay.io/cortexproject/build-image:master-6dd64fcce TTY='' configs-integration-test
+          make BUILD_IMAGE=quay.io/cortexproject/build-image:master-2866917df TTY='' configs-integration-test
 
   deploy_website:
     needs: [build, test]
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:master-6dd64fcce
+      image: quay.io/cortexproject/build-image:master-2866917df
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
@@ -272,7 +272,7 @@ jobs:
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-20.04
     container:
-      image: quay.io/cortexproject/build-image:master-6dd64fcce
+      image: quay.io/cortexproject/build-image:master-2866917df
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@
 * [ENHANCEMENT] KV: Etcd Added etcd.ping-without-stream-allowed parameter to disable/enable  PermitWithoutStream #5933
 * [ENHANCEMENT] Ingester: Add a new `limits_per_label_set` limit. This limit functions similarly to `max_series_per_metric`, but allowing users to define the maximum number of series per LabelSet. #5950 #5993
 * [ENHANCEMENT] Store Gateway: Log gRPC requests together with headers configured in `http_request_headers_to_log`. #5958
+* [ENHANCEMENT] Upgrade Alpine to 3.19. #6014
+* [ENHANCEMENT] Upgrade go to 1.21.11 #6014
 * [BUGFIX] Configsdb: Fix endline issue in db password. #5920
 * [BUGFIX] Ingester: Fix `user` and `type` labels for the `cortex_ingester_tsdb_head_samples_appended_total` TSDB metric. #5952
 

diff --git a/Makefile b/Makefile
@@ -115,7 +115,7 @@ build-image/$(UPTODATE): build-image/*
 SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
 BUILD_IN_CONTAINER := true
 BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
-LATEST_BUILD_IMAGE_TAG ?= master-6dd64fcce
+LATEST_BUILD_IMAGE_TAG ?= master-2866917df
 
 # 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/cmd/cortex/Dockerfile b/cmd/cortex/Dockerfile
@@ -1,4 +1,4 @@
-FROM       alpine:3.18
+FROM       alpine:3.19
 ARG TARGETARCH
 
 RUN        apk add --no-cache ca-certificates

diff --git a/cmd/query-tee/Dockerfile b/cmd/query-tee/Dockerfile
@@ -1,4 +1,4 @@
-FROM       alpine:3.18
+FROM       alpine:3.19
 ARG TARGETARCH
 
 RUN        apk add --no-cache ca-certificates

diff --git a/cmd/test-exporter/Dockerfile b/cmd/test-exporter/Dockerfile
@@ -1,4 +1,4 @@
-FROM       alpine:3.18
+FROM       alpine:3.19
 ARG TARGETARCH
 RUN        apk add --no-cache ca-certificates
 COPY       test-exporter-$TARGETARCH /test-exporter

diff --git a/cmd/thanosconvert/Dockerfile b/cmd/thanosconvert/Dockerfile
@@ -1,4 +1,4 @@
-FROM       alpine:3.18
+FROM       alpine:3.19
 ARG TARGETARCH
 RUN        apk add --no-cache ca-certificates
 COPY       thanosconvert-$TARGETARCH /thanosconvert

diff --git a/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile b/development/tsdb-blocks-storage-s3-gossip/dev.dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18
+FROM golang:1.19
 ENV CGO_ENABLED=0
 RUN go get github.com/go-delve/delve/cmd/dlv
 

diff --git a/development/tsdb-blocks-storage-s3-single-binary/dev.dockerfile b/development/tsdb-blocks-storage-s3-single-binary/dev.dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 
 RUN     mkdir /cortex
 WORKDIR /cortex

diff --git a/development/tsdb-blocks-storage-s3/dev.dockerfile b/development/tsdb-blocks-storage-s3/dev.dockerfile
@@ -1,8 +1,8 @@
-FROM golang:1.18
+FROM golang:1.19
 ENV CGO_ENABLED=0
 RUN go get github.com/go-delve/delve/cmd/dlv
 
-FROM alpine:3.18
+FROM alpine:3.19
 
 RUN     mkdir /cortex
 WORKDIR /cortex

diff --git a/development/tsdb-blocks-storage-swift-single-binary/dev.dockerfile b/development/tsdb-blocks-storage-swift-single-binary/dev.dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 
 RUN     mkdir /cortex
 WORKDIR /cortex

diff --git a/packaging/fpm/Dockerfile b/packaging/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 
 RUN apk add --no-cache \
         ruby \