Skip to content

Commit 319de18

Browse files
SungJin1212SungJin1212
committed
merge release 1.20.1 to master
Signed-off-by: SungJin1212 <[email protected]>
1 parent b7926aa commit 319de18

File tree

3 files changed

+27
-60
lines changed

3 files changed

+27
-60
lines changed

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -197,22 +197,14 @@ jobs:
197197
docker pull consul:1.8.4
198198
docker pull gcr.io/etcd-development/etcd:v3.4.7
199199
if [ "$TEST_TAGS" = "integration_backward_compatibility" ]; then
200-
docker pull quay.io/cortexproject/cortex:v1.13.1
201-
docker pull quay.io/cortexproject/cortex:v1.13.2
202-
docker pull quay.io/cortexproject/cortex:v1.14.0
203-
docker pull quay.io/cortexproject/cortex:v1.14.1
204-
docker pull quay.io/cortexproject/cortex:v1.15.0
205-
docker pull quay.io/cortexproject/cortex:v1.15.1
206-
docker pull quay.io/cortexproject/cortex:v1.15.2
207-
docker pull quay.io/cortexproject/cortex:v1.15.3
208-
docker pull quay.io/cortexproject/cortex:v1.16.0
209200
docker pull quay.io/cortexproject/cortex:v1.16.1
210-
docker pull quay.io/cortexproject/cortex:v1.17.0
211-
docker pull quay.io/cortexproject/cortex:v1.17.1
212-
docker pull quay.io/cortexproject/cortex:v1.18.0
201+
docker pull quay.io/cortexproject/cortex:v1.17.2
213202
docker pull quay.io/cortexproject/cortex:v1.18.1
203+
docker pull quay.io/cortexproject/cortex:v1.19.1
204+
docker pull quay.io/cortexproject/cortex:v1.20.0
205+
docker pull quay.io/cortexproject/cortex:v1.20.1
214206
elif [ "$TEST_TAGS" = "integration_query_fuzz" ]; then
215-
docker pull quay.io/cortexproject/cortex:v1.18.1
207+
docker pull quay.io/cortexproject/cortex:v1.20.1
216208
docker pull quay.io/prometheus/prometheus:v3.6.0
217209
fi
218210
docker pull memcached:1.6.1

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog
22

3+
## master / unreleased
4+
5+
* [FEATURE] StoreGateway: Introduces a new parquet mode. #7046
6+
* [ENHANCEMENT] Alertmanager: Upgrade alertmanger to 0.29.0 and add a new incidentIO integration. #7092
7+
* [ENHANCEMENT] Querier: Add a `-querier.parquet-queryable-shard-cache-ttl` flag to add TTL to parquet shard cache. #7098
8+
* [ENHANCEMENT] Ingester: Add `enable_matcher_optimization` config to apply low selectivity matchers lazily. #7063
9+
* [ENHANCEMENT] Distributor: Add a label references validation for remote write v2 request. #7074
10+
* [ENHANCEMENT] Distributor: Add count, spans, and buckets validations for native histogram. #7072
11+
* [ENHANCEMENT] Alertmanager/Ruler: Introduce a user scanner to reduce the number of list calls to object storage. #6999
12+
* [ENHANCEMENT] Ruler: Add DecodingConcurrency config flag for Thanos Engine. #7118
13+
* [ENHANCEMENT] Compactor: Avoid double compaction by cleaning partition files in 2 cycles. #7129
14+
* [ENHANCEMENT] Distributor: Optimize memory usage by recycling v2 requests. #7131
15+
* [BUGFIX] Ring: Change DynamoDB KV to retry indefinitely for WatchKey. #7088
16+
* [BUGFIX] Ruler: Add XFunctions validation support. #7111
17+
* [BUGFIX] Querier: propagate Prometheus info annotations in protobuf responses. #7132
18+
319
## 1.20.1 2025-12-03
420

521
* [BUGFIX] Distributor: Fix panic on health check failure when using stream push. #7116

‎integration/backward_compatibility_test.go‎

Lines changed: 6 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -30,56 +30,15 @@ type versionsImagesFlags struct {
3030
var (
3131
// If you change the image tag, remember to update it in the preloading done
3232
// by GitHub Actions too (see .github/workflows/test-build-deploy.yml).
33+
// Per https://cortexmetrics.io/docs/configuration/v1guarantees/#flags-config-and-minor-version-upgrades,
34+
// we only need to support backward compatibility for the last 3 minor versions.
3335
previousVersionImages = map[string]*versionsImagesFlags{
34-
"quay.io/cortexproject/cortex:v1.13.1": {
35-
flagsForOldImage: func(m map[string]string) map[string]string {
36-
m["-ingester.stream-chunks-when-using-blocks"] = "true"
37-
return m
38-
},
39-
flagsForNewImage: func(m map[string]string) map[string]string {
40-
m["-ingester.client.grpc-compression"] = "snappy"
41-
return m
42-
},
43-
},
44-
"quay.io/cortexproject/cortex:v1.13.2": {
45-
flagsForOldImage: func(m map[string]string) map[string]string {
46-
m["-ingester.stream-chunks-when-using-blocks"] = "true"
47-
return m
48-
},
49-
flagsForNewImage: func(m map[string]string) map[string]string {
50-
m["-ingester.client.grpc-compression"] = "snappy"
51-
return m
52-
},
53-
},
54-
"quay.io/cortexproject/cortex:v1.14.0": {
55-
flagsForOldImage: func(m map[string]string) map[string]string {
56-
return m
57-
},
58-
flagsForNewImage: func(m map[string]string) map[string]string {
59-
m["-ingester.client.grpc-compression"] = "snappy"
60-
return m
61-
},
62-
},
63-
"quay.io/cortexproject/cortex:v1.14.1": {
64-
flagsForOldImage: func(m map[string]string) map[string]string {
65-
return m
66-
},
67-
flagsForNewImage: func(m map[string]string) map[string]string {
68-
m["-ingester.client.grpc-compression"] = "snappy"
69-
return m
70-
},
71-
},
72-
"quay.io/cortexproject/cortex:v1.15.0": nil,
73-
"quay.io/cortexproject/cortex:v1.15.1": nil,
74-
"quay.io/cortexproject/cortex:v1.15.2": nil,
75-
"quay.io/cortexproject/cortex:v1.15.3": nil,
76-
"quay.io/cortexproject/cortex:v1.16.0": nil,
7736
"quay.io/cortexproject/cortex:v1.16.1": nil,
78-
"quay.io/cortexproject/cortex:v1.17.0": nil,
79-
"quay.io/cortexproject/cortex:v1.17.1": nil,
80-
"quay.io/cortexproject/cortex:v1.18.0": nil,
37+
"quay.io/cortexproject/cortex:v1.17.2": nil,
8138
"quay.io/cortexproject/cortex:v1.18.1": nil,
82-
"quay.io/cortexproject/cortex:v1.19.0": nil,
39+
"quay.io/cortexproject/cortex:v1.19.1": nil,
40+
"quay.io/cortexproject/cortex:v1.20.0": nil,
41+
"quay.io/cortexproject/cortex:v1.20.1": nil,
8342
}
8443
)
8544

0 commit comments

Comments
 (0)