Update cortex to v1.14.0 (#417)

* Update quay.io/cortexproject/cortex Docker tag to v1.14.0 Signed-off-by: Renovate Bot <[email protected]> * drop cortex chunk support, drop cortex config api Signed-off-by: Niclas Schad <[email protected]> * remove dropped and legacy fields Signed-off-by: Niclas Schad <[email protected]> * update Chart.lock Signed-off-by: Niclas Schad <[email protected]> * drop support for chunk caching Signed-off-by: Niclas Schad <[email protected]> * refactor caching for block storage Signed-off-by: Niclas Schad <[email protected]> * update README.md Signed-off-by: Niclas Schad <[email protected]> * update Chart.lock Signed-off-by: Niclas Schad <[email protected]> * update CHANGELOG.md Signed-off-by: Niclas Schad <[email protected]> Signed-off-by: Renovate Bot <[email protected]> Signed-off-by: Niclas Schad <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
cortexproject · Dec 15, 2022 · 04b3751 · 04b3751
1 parent 85c54a9
commit 04b3751
Show file tree

Hide file tree

Showing 24 changed files with 39 additions and 964 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,12 +3,19 @@
 ## master / unreleased
 
 * [FEATURE] add purger components to cortex #407
+* [CHANGE] With the release of memcached v6 bitnami renamed `extraEnv` to  `extraEnvVars`. Use `extraEnvVars` if you want to alter MEMCACHED_CACHE_SIZE, MEMCACHED_MAX_CONNECTIONS, etc... #303
+* [CHANGE] Caching for block storage can now be individually enabled. For example use `memcached-blocks.enabled` to enable caching for blocks. #417
+* [CHANGE] Drop cortex chunk support. #417
+* [CHANGE] Drop cortex configdb support. #417
+* [CHANGE] Removed legacy ruler and alertmanager storage configuration. Please use `ruler_storage` and `alertmanager_storage`. #417
+* [CHANGE] Dropped `storage.index_queries_cache_config`. #417
 * [ENHANCEMENT] Add verboseLogging option to nginx config #402
 * [ENHANCEMENT] Start using autoscaling/v2 for HorizontalPodAutoscaler in v1.23+ #414
 * [ENHANCEMENT] Add pod topology spread constrant option to Ingester/Alertmanager statefulset #403
 * [ENHANCEMENT] Add HPA to store gateways #406
 * [DEPENDENCY] Update quay.io/cortexproject/cortex Docker tag to v1.13.1 #401
 * [DEPENDENCY] Update Helm release memcached to v6 #303
+* [DEPENDENCY] Update Cortex to v1.14 #417
 
 # 1.7.0 / 2022-09-23
 

diff --git a/Chart.lock b/Chart.lock
@@ -11,14 +11,5 @@ dependencies:
 - name: memcached
   repository: https://charts.bitnami.com/bitnami
   version: 6.3.1
-- name: memcached
-  repository: https://charts.bitnami.com/bitnami
-  version: 6.3.1
-- name: memcached
-  repository: https://charts.bitnami.com/bitnami
-  version: 6.3.1
-- name: memcached
-  repository: https://charts.bitnami.com/bitnami
-  version: 6.3.1
-digest: sha256:ceb7ef62f82ef04d418daf298f58aade4668b6415f99e85b9a518804e44ac116
-generated: "2022-12-08T11:37:58.047028+01:00"
+digest: sha256:a2d77fb57062b13cffd15c58db9657a7793cdb523d41fa3c1e3394c966c955e3
+generated: "2022-12-09T10:01:32.936379+01:00"
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 version: 1.7.0
-appVersion: v1.13.1
+appVersion: v1.14.0
 description: 'Horizontally scalable, highly available, multi-tenant, long term Prometheus.'
 home: https://cortexmetrics.io/
 icon: https://avatars2.githubusercontent.com/u/43045022?s=200&v=4
@@ -16,21 +16,6 @@ name: cortex
 sources:
   - https://github.com/cortexproject/cortex-helm-chart
 dependencies:
-  - name: memcached
-    alias: memcached
-    version: 6.3.1
-    repository: https://charts.bitnami.com/bitnami
-    condition: memcached.enabled
-  - name: memcached
-    alias: memcached-index-read
-    version: 6.3.1
-    repository: https://charts.bitnami.com/bitnami
-    condition: memcached-index-read.enabled
-  - name: memcached
-    alias: memcached-index-write
-    version: 6.3.1
-    repository: https://charts.bitnami.com/bitnami
-    condition: memcached-index-write.enabled
   - name: memcached
     alias: memcached-frontend
     version: 6.3.1
@@ -40,17 +25,11 @@ dependencies:
     alias: memcached-blocks-index
     version: 6.3.1
     repository: https://charts.bitnami.com/bitnami
-    tags:
-      - blocks-storage-memcached
   - name: memcached
     alias: memcached-blocks
     version: 6.3.1
     repository: https://charts.bitnami.com/bitnami
-    tags:
-      - blocks-storage-memcached
   - name: memcached
     alias: memcached-blocks-metadata
     version: 6.3.1
     repository: https://charts.bitnami.com/bitnami
-    tags:
-      - blocks-storage-memcached
diff --git a/README.md b/README.md
diff --git a/ci/test-configmap-values.yaml b/ci/test-configmap-values.yaml
@@ -148,33 +148,6 @@ store_gateway:
     - name: tmp-test
       mountPath: /tmp-test
 
-tags:
-  blocks-storage-memcached: true
-memcached:
-  enabled: true
-  architecture: standalone
-  replicaCount: 1
-  resources:
-    # https://github.com/helm/helm/issues/9136
-    requests:
-      cpu: 0
-      memory: 0
-memcached-index-read:
-  enabled: true
-  architecture: standalone
-  replicaCount: 1
-  resources:
-    requests:
-      cpu: 0
-      memory: 0
-memcached-index-write:
-  enabled: true
-  architecture: standalone
-  replicaCount: 1
-  resources:
-    requests:
-      cpu: 0
-      memory: 0
 memcached-frontend:
   enabled: true
   architecture: standalone
@@ -184,20 +157,23 @@ memcached-frontend:
       cpu: 0
       memory: 0
 memcached-blocks:
+  enabled: true
   architecture: standalone
   replicaCount: 1
   resources:
     requests:
       cpu: 0
       memory: 0
 memcached-blocks-index:
+  enabled: true
   architecture: standalone
   replicaCount: 1
   resources:
     requests:
       cpu: 0
       memory: 0
 memcached-blocks-metadata:
+  enabled: true
   architecture: standalone
   replicaCount: 1
   resources:

diff --git a/ci/test-deployment-values.yaml b/ci/test-deployment-values.yaml
@@ -155,33 +155,6 @@ store_gateway:
     - name: tmp-test
       mountPath: /tmp-test
 
-tags:
-  blocks-storage-memcached: true
-memcached:
-  enabled: true
-  architecture: standalone
-  replicaCount: 1
-  resources:
-    # https://github.com/helm/helm/issues/9136
-    requests:
-      cpu: 0
-      memory: 0
-memcached-index-read:
-  enabled: true
-  architecture: standalone
-  replicaCount: 1
-  resources:
-    requests:
-      cpu: 0
-      memory: 0
-memcached-index-write:
-  enabled: true
-  architecture: standalone
-  replicaCount: 1
-  resources:
-    requests:
-      cpu: 0
-      memory: 0
 memcached-frontend:
   enabled: true
   architecture: standalone
@@ -191,20 +164,23 @@ memcached-frontend:
       cpu: 0
       memory: 0
 memcached-blocks:
+  enabled: true
   architecture: standalone
   replicaCount: 1
   resources:
     requests:
       cpu: 0
       memory: 0
 memcached-blocks-index:
+  enabled: true
   architecture: standalone
   replicaCount: 1
   resources:
     requests:
       cpu: 0
       memory: 0
 memcached-blocks-metadata:
+  enabled: true
   architecture: standalone
   replicaCount: 1
   resources:

diff --git a/ci/test-sts-values.yaml b/ci/test-sts-values.yaml
@@ -146,33 +146,6 @@ store_gateway:
     - name: tmp-test
       mountPath: /tmp-test
 
-tags:
-  blocks-storage-memcached: true
-memcached:
-  enabled: true
-  architecture: standalone
-  replicaCount: 1
-  resources:
-    # https://github.com/helm/helm/issues/9136
-    requests:
-      cpu: 0
-      memory: 0
-memcached-index-read:
-  enabled: true
-  architecture: standalone
-  replicaCount: 1
-  resources:
-    requests:
-      cpu: 0
-      memory: 0
-memcached-index-write:
-  enabled: true
-  architecture: standalone
-  replicaCount: 1
-  resources:
-    requests:
-      cpu: 0
-      memory: 0
 memcached-frontend:
   enabled: true
   architecture: standalone
@@ -182,20 +155,23 @@ memcached-frontend:
       cpu: 0
       memory: 0
 memcached-blocks:
+  enabled: true
   architecture: standalone
   replicaCount: 1
   resources:
     requests:
       cpu: 0
       memory: 0
 memcached-blocks-index:
+  enabled: true
   architecture: standalone
   replicaCount: 1
   resources:
     requests:
       cpu: 0
       memory: 0
 memcached-blocks-metadata:
+  enabled: true
   architecture: standalone
   replicaCount: 1
   resources:

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -85,23 +85,18 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 Create configuration parameters for memcached configuration
 */}}
 {{- define "cortex.memcached" -}}
-{{- if and (eq .Values.config.storage.engine "blocks") (index .Values "tags" "blocks-storage-memcached") }}
+{{- if index .Values "memcached-blocks-index" "enabled" }}
 - "-blocks-storage.bucket-store.index-cache.backend=memcached"
 - "-blocks-storage.bucket-store.index-cache.memcached.addresses=dns+{{ .Release.Name }}-memcached-blocks-index.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:11211"
+{{- end -}}
+{{- if index .Values "memcached-blocks" "enabled" }}
 - "-blocks-storage.bucket-store.chunks-cache.backend=memcached"
 - "-blocks-storage.bucket-store.chunks-cache.memcached.addresses=dns+{{ .Release.Name }}-memcached-blocks.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:11211"
+{{- end -}}
+{{- if index .Values "memcached-blocks-metadata" "enabled" }}
 - "-blocks-storage.bucket-store.metadata-cache.backend=memcached"
 - "-blocks-storage.bucket-store.metadata-cache.memcached.addresses=dns+{{ .Release.Name }}-memcached-blocks-metadata.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:11211"
 {{- end -}}
-{{- if and (ne .Values.config.storage.engine "blocks") .Values.memcached.enabled }}
-- "-store.chunks-cache.memcached.addresses=dns+{{ .Release.Name }}-memcached.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:11211"
-{{- end -}}
-{{- if and (ne .Values.config.storage.engine "blocks") (index .Values "memcached-index-read" "enabled") }}
-- "-store.index-cache-read.memcached.addresses=dns+{{ .Release.Name }}-memcached-index-read.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:11211"
-{{- end -}}
-{{- if and (ne .Values.config.storage.engine "blocks") (index .Values "memcached-index-write" "enabled") }}
-- "-store.index-cache-write.memcached.addresses=dns+{{ .Release.Name }}-memcached-index-write.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:11211"
-{{- end -}}
 {{- end -}}
 
 {{/*

diff --git a/templates/alertmanager/alertmanager-dep.yaml b/templates/alertmanager/alertmanager-dep.yaml
@@ -103,9 +103,6 @@ spec:
           args:
             - "-target=alertmanager"
             - "-config.file=/etc/cortex/cortex.yaml"
-          {{- if .Values.configs.enabled }}
-            - "-alertmanager.configs.url=http://{{ template "cortex.configsFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.server.http_listen_port }}"
-          {{- end }}
           {{- range $key, $value := .Values.alertmanager.extraArgs }}
             - "-{{ $key }}={{ $value }}"
           {{- end }}

diff --git a/templates/alertmanager/alertmanager-statefulset.yaml b/templates/alertmanager/alertmanager-statefulset.yaml
@@ -152,9 +152,6 @@ spec:
           args:
             - "-target=alertmanager"
             - "-config.file=/etc/cortex/cortex.yaml"
-            {{- if .Values.configs.enabled }}
-            - "-alertmanager.configs.url=http://{{ template "cortex.fullname" . }}-configs.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:{{ .Values.config.server.http_listen_port }}"
-            {{- end }}
             {{- range $key, $value := .Values.alertmanager.extraArgs }}
             - "-{{ $key }}={{ $value }}"
             {{- end }}

diff --git a/templates/configs/_helpers-configs.tpl b/templates/configs/_helpers-configs.tpl