Merge branch 'main' into volumemounts

grafana · Jan 7, 2021 · ec6cd55 · ec6cd55
2 parents 71544e2 + 136701f
commit ec6cd55
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 0 deletions.
diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md
@@ -141,6 +141,7 @@ helm repo add grafana https://grafana.github.io/helm-charts
 | memcachedExporter.image.registry | string | `"docker.io"` | The Docker registry for the Memcached Exporter |
 | memcachedExporter.image.repository | string | `"prom/memcached-exporter"` | Memcached Exporter Docker image repository |
 | memcachedExporter.image.tag | string | `"v0.6.0"` | Memcached Exporter Docker image tag |
+| memcachedExporter.resources | object | `{}` | Memcached Exporter resource requests and limits |
 | memcachedFrontend.affinity | string | Hard node and soft zone anti-affinity | Affinity for memcached-frontend pods. Passed through `tpl` and, thus, to be configured as string |
 | memcachedFrontend.enabled | bool | `false` | Specifies whether the Memcached frontend cache should be enabled |
 | memcachedFrontend.extraArgs | list | `[]` | Additional CLI args for memcached-frontend |

diff --git a/charts/loki-distributed/templates/memcached-chunks/statefulset-memcached-chunks.yaml b/charts/loki-distributed/templates/memcached-chunks/statefulset-memcached-chunks.yaml
@@ -78,6 +78,8 @@ spec:
             - name: http-metrics
               containerPort: 9150
               protocol: TCP
+          resources:
+            {{- toYaml .Values.memcachedExporter.resources | nindent 12 }}
         {{- end }}
       {{- with .Values.memcachedChunks.affinity }}
       affinity:

diff --git a/charts/loki-distributed/templates/memcached-frontend/statefulset-memcached-frontend.yaml b/charts/loki-distributed/templates/memcached-frontend/statefulset-memcached-frontend.yaml
@@ -78,6 +78,8 @@ spec:
             - name: http-metrics
               containerPort: 9150
               protocol: TCP
+          resources:
+            {{- toYaml .Values.memcachedExporter.resources | nindent 12 }}
         {{- end }}
       {{- with .Values.memcachedFrontend.affinity }}
       affinity:

diff --git a/...ki-distributed/templates/memcached-index-queries/statefulset-memcached-index-queries.yaml b/...ki-distributed/templates/memcached-index-queries/statefulset-memcached-index-queries.yaml
@@ -78,6 +78,8 @@ spec:
             - name: http-metrics
               containerPort: 9150
               protocol: TCP
+          resources:
+            {{- toYaml .Values.memcachedExporter.resources | nindent 12 }}
         {{- end }}
       {{- with .Values.memcachedIndexQueries.affinity }}
       affinity:

diff --git a/...loki-distributed/templates/memcached-index-writes/statefulset-memcached-index-writes.yaml b/...loki-distributed/templates/memcached-index-writes/statefulset-memcached-index-writes.yaml
@@ -78,6 +78,8 @@ spec:
             - name: http-metrics
               containerPort: 9150
               protocol: TCP
+          resources:
+            {{- toYaml .Values.memcachedExporter.resources | nindent 12 }}
         {{- end }}
       {{- with .Values.memcachedIndexWrites.affinity }}
       affinity:

diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml
@@ -834,6 +834,8 @@ memcachedExporter:
     tag: v0.6.0
     # -- Memcached Exporter Docker image pull policy
     pullPolicy: IfNotPresent
+  # -- Memcached Exporter resource requests and limits
+  resources: {}
 
 memcachedChunks:
   # -- Specifies whether the Memcached chunks cache should be enabled