Skip to content

Commit b0822d0

Browse files
nschadnschad
authored
🧹 Cleanup removed & legacy chunk config (#488)
* clean-up legacy chunk purger config Signed-off-by: Niclas Schad <[email protected]> * remove any reference of config.storage.engine since the only valid option is blocks Signed-off-by: Niclas Schad <[email protected]> * regen docs Signed-off-by: Niclas Schad <[email protected]> * changelog Signed-off-by: Niclas Schad <[email protected]> --------- Signed-off-by: Niclas Schad <[email protected]>
1 parent 775aef4 commit b0822d0

17 files changed

+6
-40
lines changed

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## master / unreleased
44

5+
* [CHANGE] Removed `config.storage.engine` and any reference of it #488
56
* [ENHANCEMENT] Add `appProtocol` field to templates/svc-memberlist-headless.yaml to fix issues wirth Istio #485
67
* [ENHANCEMENT] Add option to autoscale on multiple metrics and custom metrics metrics #467
78
* [ENHANCEMENT] Add control on store-gateway statefulset when autoscale (HPA) enabled or disabled #472
@@ -10,6 +11,7 @@
1011
* [DEPENDENCY] Update quay.io/cortexproject/cortex Docker tag to v1.15.2 #459
1112
* [DEPENDENCY] Update quay.io/cortexproject/cortex Docker tag to v1.15.3 #471
1213
* [BUGFIX] Correctly interpret .Capabilities.KubeVersion when it looks like a prerelease #457
14+
* [BUGFIX] Removed non-existent `purger.enable` flags in some components #488
1315
* [BUGFIX] Fix podTargetLabels in all Prometheus ServiceMonitor CRDs #487
1416

1517
## 2.1.0 / 2023-03-17

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ Kubernetes: `^1.19.0-0`
256256
| config.&ZeroWidthSpace;server.&ZeroWidthSpace;grpc_server_max_recv_msg_size | int | `10485760` | |
257257
| config.&ZeroWidthSpace;server.&ZeroWidthSpace;grpc_server_max_send_msg_size | int | `10485760` | |
258258
| config.&ZeroWidthSpace;server.&ZeroWidthSpace;http_listen_port | int | `8080` | |
259-
| config.&ZeroWidthSpace;storage | object | `{"engine":"blocks"}` | See https://github.com/cortexproject/cortex/blob/master/docs/configuration/config-file-reference.md#storage_config |
260259
| config.&ZeroWidthSpace;store_gateway | object | `{"sharding_enabled":false}` | https://cortexmetrics.io/docs/configuration/configuration-file/#store_gateway_config |
261260
| distributor.&ZeroWidthSpace;affinity.&ZeroWidthSpace;podAntiAffinity.&ZeroWidthSpace;preferredDuringSchedulingIgnoredDuringExecution[0].&ZeroWidthSpace;podAffinityTerm.&ZeroWidthSpace;labelSelector.&ZeroWidthSpace;matchExpressions[0].&ZeroWidthSpace;key | string | `"app.kubernetes.io/component"` | |
262261
| distributor.&ZeroWidthSpace;affinity.&ZeroWidthSpace;podAntiAffinity.&ZeroWidthSpace;preferredDuringSchedulingIgnoredDuringExecution[0].&ZeroWidthSpace;podAffinityTerm.&ZeroWidthSpace;labelSelector.&ZeroWidthSpace;matchExpressions[0].&ZeroWidthSpace;operator | string | `"In"` | |

‎ci/test-configmap-values.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ config:
1414
kvstore:
1515
store: "memberlist"
1616

17-
# See https://github.com/cortexproject/cortex/blob/master/docs/configuration/config-file-reference.md#storage_config
18-
storage:
19-
engine: blocks
2017
blocks_storage:
2118
backend: "filesystem"
2219
tsdb:

‎ci/test-deployment-values.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ config:
1212
kvstore:
1313
store: "memberlist"
1414

15-
# See https://github.com/cortexproject/cortex/blob/master/docs/configuration/config-file-reference.md#storage_config
16-
storage:
17-
engine: blocks
1815
blocks_storage:
1916
backend: "filesystem"
2017
tsdb:

‎ci/test-sts-values.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ config:
1212
kvstore:
1313
store: "memberlist"
1414

15-
# See https://github.com/cortexproject/cortex/blob/master/docs/configuration/config-file-reference.md#storage_config
16-
storage:
17-
engine: blocks
1815
blocks_storage:
1916
backend: "filesystem"
2017
tsdb:

‎docs/guides/getting_started_with_block_storage.markdown

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ config:
2929
bucket_name: # your bucket name
3030
region: us-east-1
3131
endpoint: s3.us-east-1.amazonaws.com
32-
storage:
33-
engine: blocks
3432
blocks_storage:
3533
backend: s3
3634
s3:

‎templates/NOTES.txt

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
{{- if eq .Values.config.storage.engine "chunks" }}
2-
Cortex chunks storage has been deprecated, and it's now in maintenance mode: all Cortex users are encouraged to migrate to the blocks storage.
3-
No new features will be added to the chunks storage.
4-
Unlike the official cortex default configuration this helm-chart does not run the chunk engine by default.
5-
{{- end }}
6-
71
Verify the application is working by running these commands:
82
kubectl --namespace {{ .Release.Namespace }} port-forward service/{{ include "cortex.querierFullname" . }} {{ .Values.config.server.http_listen_port }}
93
curl http://127.0.0.1:{{ .Values.config.server.http_listen_port }}/services

‎templates/compactor/compactor-statefulset.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{- if eq .Values.config.storage.engine "blocks" -}}
21
{{- if .Values.compactor.enabled -}}
32
apiVersion: apps/v1
43
kind: StatefulSet
@@ -142,4 +141,3 @@ spec:
142141
{{- toYaml .Values.compactor.env | nindent 12 }}
143142
{{- end }}
144143
{{- end -}}
145-
{{- end -}}

‎templates/compactor/compactor-svc.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{- if eq .Values.config.storage.engine "blocks" -}}
21
{{- if .Values.compactor.enabled -}}
32
apiVersion: v1
43
kind: Service
@@ -22,4 +21,3 @@ spec:
2221
selector:
2322
{{- include "cortex.compactorSelectorLabels" . | nindent 4 }}
2423
{{- end -}}
25-
{{- end -}}

‎templates/purger/purger-svc.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{- if eq .Values.config.storage.engine "blocks" -}}
21
{{- if .Values.purger.enabled -}}
32
apiVersion: v1
43
kind: Service
@@ -22,4 +21,3 @@ spec:
2221
selector:
2322
{{- include "cortex.purgerSelectorLabels" . | nindent 4 }}
2423
{{- end -}}
25-
{{- end -}}

‎templates/querier/querier-dep.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ spec:
5858
{{- if and .Values.query_frontend.enabled (not .Values.query_scheduler.enabled) }}
5959
- "-querier.frontend-address={{ template "cortex.queryFrontendFullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.server.grpc_listen_port }}"
6060
{{- end }}
61-
{{- if .Values.purger.enabled }}
62-
- "-purger.enable"
63-
{{- end }}
6461
{{- include "cortex.memcached" . | nindent 12}}
6562
{{- range $key, $value := .Values.querier.extraArgs }}
6663
- "-{{ $key }}={{ $value }}"

‎templates/query-frontend/query-frontend-dep.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ spec:
5454
{{- if .Values.query_scheduler.enabled }}
5555
- "-frontend.scheduler-address={{ template "cortex.querySchedulerFullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.server.grpc_listen_port }}"
5656
{{- end }}
57-
{{- if .Values.purger.enabled }}
58-
- "-purger.enable"
59-
{{- end }}
6057
{{- range $key, $value := .Values.query_frontend.extraArgs }}
6158
- "-{{ $key }}={{ $value }}"
6259
{{- end }}

‎templates/ruler/ruler-dep.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ spec:
112112
- "-ruler.alertmanager-url=http://{{ template "cortex.alertmanagerFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.server.http_listen_port }}/api/prom/alertmanager/"
113113
{{- end }}
114114
{{- end }}
115-
{{- if .Values.purger.enabled }}
116-
- "-purger.enable"
117-
{{- end }}
118115
{{- include "cortex.memcached" . | nindent 12}}
119116
{{- range $key, $value := .Values.ruler.extraArgs }}
120117
- "-{{ $key }}={{ $value }}"

‎templates/store-gateway/store-gateway-statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and (eq .Values.config.storage.engine "blocks") (.Values.store_gateway.enabled) -}}
1+
{{- if .Values.store_gateway.enabled -}}
22
apiVersion: apps/v1
33
kind: StatefulSet
44
metadata:

‎templates/store-gateway/store-gateway-svc-headless.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and (eq .Values.config.storage.engine "blocks") .Values.store_gateway.enabled -}}
1+
{{- if .Values.store_gateway.enabled -}}
22
apiVersion: v1
33
kind: Service
44
metadata:

‎templates/store-gateway/store-gateway-svc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and (eq .Values.config.storage.engine "blocks") (.Values.store_gateway.enabled) -}}
1+
{{- if .Values.store_gateway.enabled -}}
22
apiVersion: v1
33
kind: Service
44
metadata:

‎values.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@ config:
7676
grpc_client_config:
7777
max_recv_msg_size: 10485760
7878
max_send_msg_size: 10485760
79-
# -- See https://github.com/cortexproject/cortex/blob/master/docs/configuration/config-file-reference.md#storage_config
80-
storage:
81-
engine: blocks
8279
blocks_storage:
8380
tsdb:
8481
dir: /data/tsdb
@@ -109,7 +106,7 @@ config:
109106
# form a ring and addresses are picked from the ring).
110107
# @default -- automatic
111108
store_gateway_addresses: |-
112-
{{ if and (eq .Values.config.storage.engine "blocks") (not .Values.config.store_gateway.sharding_enabled) -}}
109+
{{ if not .Values.config.store_gateway.sharding_enabled -}}
113110
dns+{{ include "cortex.storeGatewayFullname" $ }}-headless:9095
114111
{{- end }}
115112
query_range:

0 commit comments

Comments
 (0)