Skip to content

Commit b8f24f2

Browse files
committed
merge release 1.19.1 to master
Signed-off-by: yeya24 <benye@amazon.com>
2 parents 86408ce + bb7fe1e commit b8f24f2

File tree

4,609 files changed

+1128248
-124356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,609 files changed

+1128248
-124356
lines changed

.errcheck-exclude

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: ✏️ New blog post
2+
description: Create a blog post to share
3+
title: "[BLOG] <title>"
4+
labels: ['new blog, enhancement, untriaged']
5+
projects: ["cortexproject/Digital Marketing Content"]
6+
body:
7+
8+
- type: markdown
9+
attributes:
10+
value: "## Required information "
11+
- type: markdown
12+
attributes:
13+
value: |
14+
Provide a rough description, the title, and the expected category of the blog post.
15+
- type: textarea
16+
attributes:
17+
label: Describe the blog post
18+
description: A clear and concise description of what subject the blog post will cover.
19+
placeholder: What will it cover?
20+
validations:
21+
required: true
22+
23+
- type: input
24+
attributes:
25+
label: Expected Title
26+
description: What might the title of this post be?
27+
placeholder: Title
28+
validations:
29+
required: true
30+
- type: input
31+
attributes:
32+
label: Authors Name
33+
placeholder: First Last
34+
validations:
35+
required: true
36+
- type: input
37+
attributes:
38+
label: Authors Email
39+
placeholder: email@example.com or Github profile
40+
validations:
41+
required: true
42+
- type: input
43+
attributes:
44+
label: Target Draft Date
45+
placeholder: mm/dd/yyyy
46+
validations:
47+
required: false
48+
- type: dropdown
49+
attributes:
50+
label: Blog Post Category
51+
description: Select all that apply
52+
multiple: true
53+
options:
54+
- technical
55+
- community
56+
- partners
57+
- events
58+
- releases
59+
default: 0
60+
validations:
61+
required: true
62+
- type: markdown
63+
attributes:
64+
value: "<br/> <br/> "
65+
66+
- type: markdown
67+
attributes:
68+
value: "## Additional context "
69+
- type: markdown
70+
attributes:
71+
value: |
72+
Provide any additional info or context
73+
- type: input
74+
attributes:
75+
label: Target Publication Date
76+
placeholder: mm/dd/yyyy
77+
validations:
78+
required: false
79+
80+
- type: textarea
81+
attributes:
82+
label: Additional Info
83+
description: Provide any additional context or content that you would like to include for this blog post.
84+
validations:
85+
required: false

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ updates:
1313
actions-dependencies:
1414
dependency-type: "production"
1515
labels:
16-
- "infra"
16+
- "ci/cd"
1717
- package-ecosystem: "gomod"
1818
directories:
1919
- "/"

.github/workflows/build-image.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ jobs:
2525
fetch-depth: 0
2626

2727
- name: Set up QEMU
28-
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
28+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
2929

3030
- name: Set up Docker Buildx
31-
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
31+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
3232

3333
- name: Save image
3434
run: make save-multiarch-build-image
3535

3636
- name: Upload Docker Images Artifacts
37-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
37+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
3838
with:
3939
name: build-image
4040
path: |
@@ -53,15 +53,15 @@ jobs:
5353
fetch-depth: 0
5454

5555
- name: Download Docker Images Artifacts
56-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
56+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
5757
with:
5858
name: build-image
5959

6060
- name: Load image
6161
run: make load-multiarch-build-image
6262

6363
- name: Login to Quay.io
64-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
64+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
6565
with:
6666
registry: quay.io
6767
username: ${{secrets.QUAY_REGISTRY_USER}}

.github/workflows/scorecards.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
persist-credentials: false
3434

3535
- name: "Run analysis"
36-
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
36+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
3737
with:
3838
results_file: results.sarif
3939
results_format: sarif
@@ -55,7 +55,7 @@ jobs:
5555
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5656
# format to the repository Actions tab.
5757
- name: "Upload artifact"
58-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v3.pre.node20
58+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v3.pre.node20
5959
with:
6060
name: SARIF file
6161
path: results.sarif
@@ -64,6 +64,6 @@ jobs:
6464
# Upload the results to GitHub's code scanning dashboard (optional).
6565
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
6666
- name: "Upload to code-scanning"
67-
uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
67+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
6868
with:
6969
sarif_file: results.sarif

.github/workflows/test-build-deploy.yml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
lint:
1818
runs-on: ubuntu-24.04
1919
container:
20-
image: quay.io/cortexproject/build-image:master-03a8f8c98
20+
image: quay.io/cortexproject/build-image:master-59491e9aae
2121
steps:
2222
- name: Checkout Repo
2323
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -42,11 +42,13 @@ jobs:
4242
run: make BUILD_IN_CONTAINER=false check-doc
4343
- name: Check White Noise.
4444
run: make BUILD_IN_CONTAINER=false check-white-noise
45+
- name: Check Modernize
46+
run: make BUILD_IN_CONTAINER=false check-modernize
4547

4648
test:
4749
runs-on: ubuntu-24.04
4850
container:
49-
image: quay.io/cortexproject/build-image:master-03a8f8c98
51+
image: quay.io/cortexproject/build-image:master-59491e9aae
5052
steps:
5153
- name: Checkout Repo
5254
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -64,7 +66,7 @@ jobs:
6466
test-no-race:
6567
runs-on: ubuntu-24.04
6668
container:
67-
image: quay.io/cortexproject/build-image:master-03a8f8c98
69+
image: quay.io/cortexproject/build-image:master-59491e9aae
6870
steps:
6971
- name: Checkout Repo
7072
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -93,21 +95,21 @@ jobs:
9395

9496
# Initializes the CodeQL tools for scanning.
9597
- name: Initialize CodeQL
96-
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
98+
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
9799
with:
98100
languages: go
99101

100102
- name: Autobuild
101-
uses: github/codeql-action/autobuild@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
103+
uses: github/codeql-action/autobuild@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
102104

103105
- name: Perform CodeQL Analysis
104-
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
106+
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
105107

106108

107109
build:
108110
runs-on: ubuntu-24.04
109111
container:
110-
image: quay.io/cortexproject/build-image:master-03a8f8c98
112+
image: quay.io/cortexproject/build-image:master-59491e9aae
111113
steps:
112114
- name: Checkout Repo
113115
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -131,7 +133,7 @@ jobs:
131133
touch build-image/.uptodate
132134
make BUILD_IN_CONTAINER=false web-build
133135
- name: Upload Website Artifact
134-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
136+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
135137
with:
136138
name: website public
137139
path: website/public/
@@ -143,7 +145,7 @@ jobs:
143145
- name: Create Docker Images Archive
144146
run: tar -cvf images.tar /tmp/images
145147
- name: Upload Docker Images Artifact
146-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
148+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
147149
with:
148150
name: Docker Images
149151
path: ./images.tar
@@ -162,11 +164,12 @@ jobs:
162164
- integration_querier
163165
- integration_ruler
164166
- integration_query_fuzz
167+
- integration_remote_write_v2
165168
steps:
166169
- name: Upgrade golang
167-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
170+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
168171
with:
169-
go-version: 1.23.2
172+
go-version: 1.24.0
170173
- name: Checkout Repo
171174
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
172175
- name: Install Docker Client
@@ -176,7 +179,7 @@ jobs:
176179
sudo mkdir -p /go/src/github.com/cortexproject/cortex
177180
sudo ln -s $GITHUB_WORKSPACE/* /go/src/github.com/cortexproject/cortex
178181
- name: Download Docker Images Artifacts
179-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
182+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
180183
with:
181184
name: Docker Images
182185
- name: Extract Docker Images Archive
@@ -210,8 +213,7 @@ jobs:
210213
docker pull quay.io/cortexproject/cortex:v1.18.1
211214
elif [ "$TEST_TAGS" = "integration_query_fuzz" ]; then
212215
docker pull quay.io/cortexproject/cortex:v1.18.1
213-
docker pull quay.io/prometheus/prometheus:v2.51.0
214-
docker pull quay.io/prometheus/prometheus:v2.55.1
216+
docker pull quay.io/prometheus/prometheus:v3.5.0
215217
fi
216218
docker pull memcached:1.6.1
217219
docker pull redis:7.0.4-alpine
@@ -224,7 +226,7 @@ jobs:
224226
export CORTEX_IMAGE="${CORTEX_IMAGE_PREFIX}cortex:$IMAGE_TAG-amd64"
225227
export CORTEX_CHECKOUT_DIR="/go/src/github.com/cortexproject/cortex"
226228
echo "Running integration tests with image: $CORTEX_IMAGE"
227-
go test -tags=integration,${{ matrix.tags }} -timeout 2400s -v -count=1 ./integration/...
229+
go test -tags=slicelabels,integration,${{ matrix.tags }} -timeout 2400s -v -count=1 ./integration/...
228230
env:
229231
IMAGE_PREFIX: ${{ secrets.IMAGE_PREFIX }}
230232

@@ -237,7 +239,7 @@ jobs:
237239
- name: Install Docker Client
238240
run: sudo ./.github/workflows/scripts/install-docker.sh
239241
- name: Download Docker Images Artifact
240-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
242+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
241243
with:
242244
name: Docker Images
243245
- name: Extract Docker Images Archive
@@ -247,14 +249,14 @@ jobs:
247249
run: |
248250
touch build-image/.uptodate
249251
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
250-
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-03a8f8c98 TTY='' configs-integration-test
252+
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-59491e9aae TTY='' configs-integration-test
251253

252254
deploy_website:
253255
needs: [build, test]
254-
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
256+
if: github.ref == 'refs/heads/master' && github.repository == 'cortexproject/cortex'
255257
runs-on: ubuntu-24.04
256258
container:
257-
image: quay.io/cortexproject/build-image:master-03a8f8c98
259+
image: quay.io/cortexproject/build-image:master-59491e9aae
258260
steps:
259261
- name: Checkout Repo
260262
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -271,7 +273,7 @@ jobs:
271273
mkdir -p /go/src/github.com/cortexproject/cortex
272274
ln -s $GITHUB_WORKSPACE/* /go/src/github.com/cortexproject/cortex
273275
- name: Download Website Artifact
274-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
276+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
275277
with:
276278
name: website public
277279
path: website/public
@@ -296,7 +298,7 @@ jobs:
296298
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
297299
runs-on: ubuntu-24.04
298300
container:
299-
image: quay.io/cortexproject/build-image:master-03a8f8c98
301+
image: quay.io/cortexproject/build-image:master-59491e9aae
300302
steps:
301303
- name: Checkout Repo
302304
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -312,7 +314,7 @@ jobs:
312314
mkdir -p /go/src/github.com/cortexproject/cortex
313315
ln -s $GITHUB_WORKSPACE/* /go/src/github.com/cortexproject/cortex
314316
- name: Download Docker Images Artifact
315-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
317+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
316318
with:
317319
name: Docker Images
318320
- name: Extract Docker Images Archive

0 commit comments

Comments
 (0)