Skip to content

Commit 90cf574

Browse files
authored
Cut Cortex 1.3.0 (#3071)
* Cut Cortex 1.3.0 Signed-off-by: Marco Pracucci <[email protected]> * Fixed CHANGELOG Signed-off-by: Marco Pracucci <[email protected]>
1 parent 8d6a573 commit 90cf574

12 files changed

+28
-34
lines changed

CHANGELOG.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,7 @@
22

33
## master / unreleased
44

5-
## 1.3.0-rc.2 / 2020-08-14
6-
7-
* [BUGFIX] Querier: query /series from ingesters regardless the `-querier.query-ingesters-within` setting. #3035
8-
9-
## 1.3.0-rc.1 / 2020-08-10
10-
11-
* [ENHANCEMENT] Ingester: added `Dropped` outcome to metric `cortex_ingester_flushing_dequeued_series_total`. #2998
12-
* [BUGFIX] Ruler: fixed an unintentional breaking change introduced in the ruler's `alertmanager_url` YAML config option, which changed the value from a string to a list of strings. #2989
13-
14-
## 1.3.0-rc.0 / 2020-08-05
5+
## 1.3.0 / 2020-08-21
156

167
* [CHANGE] Replace the metric `cortex_alertmanager_configs` with `cortex_alertmanager_config_invalid` exposed by Alertmanager. #2960
178
* [CHANGE] Experimental Delete Series: Change target flag for purger from `data-purger` to `purger`. #2777
@@ -103,6 +94,7 @@
10394
* [ENHANCEMENT] Logger: added JSON logging support, configured via the `-log.format=json` CLI flag or its respective YAML config option. #2386
10495
* [ENHANCEMENT] Added new flags `-bigtable.grpc-compression`, `-ingester.client.grpc-compression`, `-querier.frontend-client.grpc-compression` to configure compression used by gRPC. Valid values are `gzip`, `snappy`, or empty string (no compression, default). #2940
10596
* [ENHANCEMENT] Clarify limitations of the `/api/v1/series`, `/api/v1/labels` and `/api/v1/label/{name}/values` endpoints. #2953
97+
* [ENHANCEMENT] Ingester: added `Dropped` outcome to metric `cortex_ingester_flushing_dequeued_series_total`. #2998
10698
* [BUGFIX] Fixed a bug with `api/v1/query_range` where no responses would return null values for `result` and empty values for `resultType`. #2962
10799
* [BUGFIX] Fixed a bug in the index intersect code causing storage to return more chunks/series than required. #2796
108100
* [BUGFIX] Fixed the number of reported keys in the background cache queue. #2764
@@ -123,6 +115,8 @@
123115
* [BUGFIX] Fix panic caused by KVs from boltdb being used beyond their life. #2971
124116
* [BUGFIX] Experimental blocks storage: `/api/v1/series`, `/api/v1/labels` and `/api/v1/label/{name}/values` only query the TSDB head regardless of the configured `-experimental.blocks-storage.tsdb.retention-period`. #2974
125117
* [BUGFIX] Ingester: Avoid indefinite checkpointing in case of surge in number of series. #2955
118+
* [BUGFIX] Querier: query /series from ingesters regardless the `-querier.query-ingesters-within` setting. #3035
119+
* [BUGFIX] Ruler: fixed an unintentional breaking change introduced in the ruler's `alertmanager_url` YAML config option, which changed the value from a string to a list of strings. #2989
126120

127121
## 1.2.0 / 2020-07-01
128122

RELEASE.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,18 @@ To prepare release branch, first create new release branch (release-X.Y) in Cort
7373
* `[ENHANCEMENT]`
7474
* `[BUGFIX]`
7575
- Run `./tools/release/check-changelog.sh LAST-RELEASE-TAG...master` and add any missing PR which includes user-facing changes
76-
3. For a major or minor **stable** release, update the Cortex version in the following locations:
77-
- Kubernetes manifests located at `k8s/`
78-
- Documentation located at `docs/`
7976

8077
Once your PR with release prepartion is approved, merge it to "release-X.Y" branch, and continue with publishing.
8178

8279
### Publish a release candidate
8380

8481
To publish a release candidate:
8582

83+
1. Do not change the release branch directly; make a PR to the release-X.Y branch with VERSION and any CHANGELOG changes.
8684
1. Ensure the `VERSION` file has the `-rc.X` suffix (`X` starting from `0`)
87-
1a. Do not change the release branch directly; make a PR to the release-X.Y branch with VERSION and any CHANGELOG changes.
88-
2. `git tag` the new release (see [How to tag a release](#how-to-tag-a-release))
89-
3. Wait until CI pipeline succeeded (once a tag is created, the release process through CircleCI will be triggered for this tag)
90-
3. Create a pre-release in GitHub
85+
1. `git tag` the new release (see [How to tag a release](#how-to-tag-a-release))
86+
1. Wait until CI pipeline succeeded (once a tag is created, the release process through CircleCI will be triggered for this tag)
87+
1. Create a pre-release in GitHub
9188
- Write the release notes (including a copy-paste of the changelog)
9289
- Build binaries with `make dist` and attach them to the release
9390
- Build packages with `make packages`, test them with `make test-packages` and attach them to the release
@@ -96,21 +93,24 @@ To publish a release candidate:
9693

9794
To publish a stable release:
9895

96+
1. Do not change the release branch directly; make a PR to the release-X.Y branch with VERSION and any CHANGELOG changes.
9997
1. Ensure the `VERSION` file has **no** `-rc.X` suffix
100-
2. Do not change the release branch directly; make a PR to the release-X.Y branch with VERSION and any CHANGELOG changes.
101-
3. `git tag` the new release (see [How to tag a release](#how-to-tag-a-release))
102-
4. Wait until CI pipeline succeeded (once a tag is created, the release process through CircleCI will be triggered for this tag)
103-
5. Create a release in GitHub
98+
1. Update the Cortex version in the following locations:
99+
- Kubernetes manifests located at `k8s/`
100+
- Documentation located at `docs/`
101+
1. `git tag` the new release (see [How to tag a release](#how-to-tag-a-release))
102+
1. Wait until CI pipeline succeeded (once a tag is created, the release process through CircleCI will be triggered for this tag)
103+
1. Create a release in GitHub
104104
- Write the release notes (including a copy-paste of the changelog)
105105
- Build binaries with `make dist` and attach them to the release
106106
- Build packages with `make packages`, test them with `make test-packages` and attach them to the release
107-
6. Merge the release branch `release-x.y` to `master`
107+
1. Merge the release branch `release-x.y` to `master`
108108
- Merge to `master` in the local checkout
109109
- Fix any conflict and `git commit -s`
110110
- Temporarily disable "Include administrators" in the [`master` branch protection rule](https://github.com/cortexproject/cortex/settings/branch_protection_rules)
111111
- Push changes to upstream (please double check before pushing!)
112112
- Re-enable "Include administrators" in the [`master` branch protection rule](https://github.com/cortexproject/cortex/settings/branch_protection_rules)
113-
7. Open a PR to add the new version to the backward compatibility integration test (`integration/backward_compatibility_test.go`)
113+
1. Open a PR to add the new version to the backward compatibility integration test (`integration/backward_compatibility_test.go`)
114114

115115
### How to tag a release
116116

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3.0-rc.2
1+
1.3.0

docs/production/storage-cassandra.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ storage:
109109
```
110110

111111
The latest tag is not published for the Cortex docker image. Visit quay.io/repository/cortexproject/cortex
112-
to find the latest stable version tag and use it in the command below (currently it is `v1.2.0`).
112+
to find the latest stable version tag and use it in the command below (currently it is `v1.3.0`).
113113

114114
Run Cortex using the latest stable version:
115115

116116
```
117-
docker run -d --name=cortex -v $(pwd)/single-process-config.yaml:/etc/single-process-config.yaml -p 9009:9009 quay.io/cortexproject/cortex:v1.2.0 -config.file=/etc/single-process-config.yaml
117+
docker run -d --name=cortex -v $(pwd)/single-process-config.yaml:/etc/single-process-config.yaml -p 9009:9009 quay.io/cortexproject/cortex:v1.3.0 -config.file=/etc/single-process-config.yaml
118118
```
119119
In case you prefer to run the master version, please follow this [documentation](../getting-started/getting-started-chunks.md) on how to build Cortex from source.
120120

k8s/alertmanager-dep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: alertmanager
18-
image: quay.io/cortexproject/cortex:v1.2.0
18+
image: quay.io/cortexproject/cortex:v1.3.0
1919
imagePullPolicy: IfNotPresent
2020
args:
2121
- -target=alertmanager

k8s/configs-dep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: configs
18-
image: quay.io/cortexproject/cortex:v1.2.0
18+
image: quay.io/cortexproject/cortex:v1.3.0
1919
imagePullPolicy: IfNotPresent
2020
args:
2121
- -target=configs

k8s/distributor-dep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: distributor
18-
image: quay.io/cortexproject/cortex:v1.2.0
18+
image: quay.io/cortexproject/cortex:v1.3.0
1919
imagePullPolicy: IfNotPresent
2020
args:
2121
- -target=distributor

k8s/ingester-dep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737

3838
containers:
3939
- name: ingester
40-
image: quay.io/cortexproject/cortex:v1.2.0
40+
image: quay.io/cortexproject/cortex:v1.3.0
4141
imagePullPolicy: IfNotPresent
4242
args:
4343
- -target=ingester

k8s/querier-dep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: querier
18-
image: quay.io/cortexproject/cortex:v1.2.0
18+
image: quay.io/cortexproject/cortex:v1.3.0
1919
imagePullPolicy: IfNotPresent
2020
args:
2121
- -target=querier

k8s/query-frontend-dep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: query-frontend
18-
image: quay.io/cortexproject/cortex:v1.2.0
18+
image: quay.io/cortexproject/cortex:v1.3.0
1919
imagePullPolicy: IfNotPresent
2020
args:
2121
- -target=query-frontend

k8s/ruler-dep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: ruler
18-
image: quay.io/cortexproject/cortex:v1.2.0
18+
image: quay.io/cortexproject/cortex:v1.3.0
1919
imagePullPolicy: IfNotPresent
2020
args:
2121
- -target=ruler

k8s/table-manager-dep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: table-manager
18-
image: quay.io/cortexproject/cortex:v1.2.0
18+
image: quay.io/cortexproject/cortex:v1.3.0
1919
imagePullPolicy: IfNotPresent
2020
args:
2121
- -target=table-manager

0 commit comments

Comments
 (0)