missing memcachedExporter resources + imagePullSecrets (#2321)

* missing memcachedExporter resources + imagePullSecrets
grafana · Jul 12, 2022 · e4bc8cd · e4bc8cd
1 parent 6b3d482
commit e4bc8cd
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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/...s-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-statefulset.yaml b/...s-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/...oss-values-generated/mimir-distributed/templates/index-cache/index-cache-statefulset.yaml b/...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/...lues-generated/mimir-distributed/templates/metadata-cache/metadata-cache-statefulset.yaml b/...lues-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/...values-generated/mimir-distributed/templates/results-cache/results-cache-statefulset.yaml b/...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: {}