From e4bc8cd8869b86e7b4cd6a198396278774274af8 Mon Sep 17 00:00:00 2001 From: Michael Borens Date: Tue, 12 Jul 2022 17:36:40 +0200 Subject: [PATCH] missing memcachedExporter resources + imagePullSecrets (#2321) * missing memcachedExporter resources + imagePullSecrets --- operations/helm/charts/mimir-distributed/CHANGELOG.md | 3 +++ .../templates/memcached/_memcached-statefulset.tpl | 8 ++++++++ operations/helm/charts/mimir-distributed/values.yaml | 4 ++++ .../templates/chunks-cache/chunks-cache-statefulset.yaml | 3 +++ .../templates/index-cache/index-cache-statefulset.yaml | 3 +++ .../metadata-cache/metadata-cache-statefulset.yaml | 3 +++ .../results-cache/results-cache-statefulset.yaml | 3 +++ 7 files changed, 27 insertions(+) diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md index b124ff3400..4f6179ee88 100644 --- a/operations/helm/charts/mimir-distributed/CHANGELOG.md +++ b/operations/helm/charts/mimir-distributed/CHANGELOG.md @@ -44,6 +44,9 @@ Entries should include a reference to the Pull Request that introduced the chang * [CHANGE] Remove setting `server.grpc_server_max_recv_msg_size` and `server.grpc_server_max_send_msg_size` to 100MB, since it is the default now, see #1884. #2300 * [FEATURE] Add `mimir-continuous-test` in smoke-test mode. Use `helm test` to run a smoke test of the read + write path. * [FEATURE] Add meta-monitoring via the Grafana Agent Kubernetes operator: scrape metrics and collect logs from Mimir pods and ship them to a remote. #2068 +* [ENHANCEMENT] Update memcached statefulset manifest #2321 + - Added imagePullSecrets block to pull images from private registry + - Added resources block for memcachedExporter * [ENHANCEMENT] ServiceMonitor object will now have default values based on release namesapce in the `namespace` and `namespaceSelector` fields. #2123 * [ENHANCEMENT] Set the `namespace` metadata field for all kubernetes objects to enable using `--namespace` correctly with Helm even if the specified namespace does not exist. #2123 * [ENHANCEMENT] The new value `serviceMonitor.clusterLabel` controls whether to add a `cluster` label and with what content to ServiceMonitor metrics. #2125 diff --git a/operations/helm/charts/mimir-distributed/templates/memcached/_memcached-statefulset.tpl b/operations/helm/charts/mimir-distributed/templates/memcached/_memcached-statefulset.tpl index ec08c05ad2..b04eba878a 100644 --- a/operations/helm/charts/mimir-distributed/templates/memcached/_memcached-statefulset.tpl +++ b/operations/helm/charts/mimir-distributed/templates/memcached/_memcached-statefulset.tpl @@ -54,6 +54,12 @@ spec: tolerations: {{- toYaml .tolerations | nindent 8 }} terminationGracePeriodSeconds: {{ .terminationGracePeriodSeconds }} + {{- if $.ctx.Values.image.pullSecrets }} + imagePullSecrets: + {{- range $.ctx.Values.image.pullSecrets }} + - name: {{ . }} + {{- end }} + {{- end }} containers: {{- if .extraContainers }} {{ toYaml .extraContainers | nindent 8 }} @@ -110,6 +116,8 @@ spec: args: - "--memcached.address=localhost:{{ .port }}" - "--web.listen-address=0.0.0.0:9150" + resources: + {{- toYaml $.ctx.Values.memcachedExporter.resources | nindent 12 }} {{- end }} {{- end -}} {{- end -}} diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml index d0f35ba3d1..7e49ac8e9f 100644 --- a/operations/helm/charts/mimir-distributed/values.yaml +++ b/operations/helm/charts/mimir-distributed/values.yaml @@ -1051,6 +1051,10 @@ memcachedExporter: tag: v0.6.0 pullPolicy: IfNotPresent + resources: + requests: {} + limits: {} + chunks-cache: # -- Specifies whether memcached based chunks-cache should be enabled enabled: false diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-statefulset.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-statefulset.yaml index 8d9b508f49..3f7505d71e 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-statefulset.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-statefulset.yaml @@ -89,3 +89,6 @@ spec: args: - "--memcached.address=localhost:11211" - "--web.listen-address=0.0.0.0:9150" + resources: + limits: {} + requests: {} diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/index-cache/index-cache-statefulset.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/index-cache/index-cache-statefulset.yaml index 220581dcec..9c0bef8e6d 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/index-cache/index-cache-statefulset.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/index-cache/index-cache-statefulset.yaml @@ -89,3 +89,6 @@ spec: args: - "--memcached.address=localhost:11211" - "--web.listen-address=0.0.0.0:9150" + resources: + limits: {} + requests: {} diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/metadata-cache/metadata-cache-statefulset.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/metadata-cache/metadata-cache-statefulset.yaml index 93f0dc1c26..d81bf79f71 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/metadata-cache/metadata-cache-statefulset.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/metadata-cache/metadata-cache-statefulset.yaml @@ -89,3 +89,6 @@ spec: args: - "--memcached.address=localhost:11211" - "--web.listen-address=0.0.0.0:9150" + resources: + limits: {} + requests: {} diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/results-cache/results-cache-statefulset.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/results-cache/results-cache-statefulset.yaml index 2748a98f54..5662f38791 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/results-cache/results-cache-statefulset.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/results-cache/results-cache-statefulset.yaml @@ -89,3 +89,6 @@ spec: args: - "--memcached.address=localhost:11211" - "--web.listen-address=0.0.0.0:9150" + resources: + limits: {} + requests: {}