Helm 5.2.3 release (#7633)

* [Helm] Fix admin-cache max connections (#7632) * [Helm] Fix admin-cache max connections * Enable caches in enterprise test * Enable only the admin cache * Fix typo * Push updated tests * rebase main and add back all caches * Update CHANGELOG (cherry picked from commit f377ac3) * Update version and release notes * helm-docs * Rebuild helm tests
grafana · Mar 15, 2024 · 86a63fb · 86a63fb
1 parent 94f63ad
commit 86a63fb
Show file tree

Hide file tree

Showing 22 changed files with 827 additions and 3 deletions.
diff --git a/docs/sources/helm-charts/mimir-distributed/release-notes/v5.2.md b/docs/sources/helm-charts/mimir-distributed/release-notes/v5.2.md
@@ -32,3 +32,7 @@ Notable enhancements are as follows:
 ### 5.2.2
 
 - [PR 7555](https://github.com/grafana/mimir/pull/7555): Update GEM to v2.11.2
+
+### 5.2.3
+
+- [PR 7632](https://github.com/grafana/mimir/pull/7632): Fix crashloop in GEM admin-cache container
diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -28,6 +28,10 @@ Entries should include a reference to the Pull Request that introduced the chang
 
 ## main / unreleased
 
+## 5.2.3
+
+* [BUGFIX] admin-cache: set max connections to fix failure to start #7632
+
 ## 5.2.2
 
 * [BUGFix] Updated GEM image to v2.11.2. #7555

diff --git a/operations/helm/charts/mimir-distributed/Chart.yaml b/operations/helm/charts/mimir-distributed/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 5.2.2
+version: 5.2.3
 appVersion: 2.11.0
 description: "Grafana Mimir"
 home: https://grafana.com/docs/helm-charts/mimir-distributed/latest/

diff --git a/operations/helm/charts/mimir-distributed/README.md b/operations/helm/charts/mimir-distributed/README.md
@@ -4,7 +4,7 @@ Helm chart for deploying [Grafana Mimir](https://grafana.com/docs/mimir/latest/)
 
 For the full documentation, visit [Grafana mimir-distributed Helm chart documentation](https://grafana.com/docs/helm-charts/mimir-distributed/latest/).
 
-> **Note:** The documentation version is derived from the Helm chart version which is 5.2.2.
+> **Note:** The documentation version is derived from the Helm chart version which is 5.2.3.
 
 When upgrading from Helm chart version 4.X, please see [Migrate the Helm chart from version 4.x to 5.0](https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-helm-chart-4.x-to-5.0/).
 When upgrading from Helm chart version 3.x, please see [Migrate from single zone to zone-aware replication with Helm](https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-from-single-zone-with-helm/).
@@ -14,7 +14,7 @@ When upgrading from Helm chart version 2.1, please see [Upgrade the Grafana Mimi
 
 # mimir-distributed
 
-![Version: 5.2.2](https://img.shields.io/badge/Version-5.2.2-informational?style=flat-square) ![AppVersion: 2.11.0](https://img.shields.io/badge/AppVersion-2.11.0-informational?style=flat-square)
+![Version: 5.2.3](https://img.shields.io/badge/Version-5.2.3-informational?style=flat-square) ![AppVersion: 2.11.0](https://img.shields.io/badge/AppVersion-2.11.0-informational?style=flat-square)
 
 Grafana Mimir
 

diff --git a/operations/helm/charts/mimir-distributed/ci/test-enterprise-configmap-values.yaml b/operations/helm/charts/mimir-distributed/ci/test-enterprise-configmap-values.yaml
@@ -83,3 +83,33 @@ testing:
 
 rollout_operator:
   enabled: false
+
+admin-cache:
+  enabled: true
+  replicas: 1
+  resources:
+    <<: *ci_resources
+
+chunks-cache:
+  enabled: true
+  replicas: 1
+  resources:
+    <<: *ci_resources
+
+index-cache:
+  enabled: true
+  replicas: 1
+  resources:
+    <<: *ci_resources
+
+metadata-cache:
+  enabled: true
+  replicas: 1
+  resources:
+    <<: *ci_resources
+
+results-cache:
+  enabled: true
+  replicas: 1
+  resources:
+    <<: *ci_resources
diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
@@ -3261,6 +3261,9 @@ admin-cache:
   # -- Maximum item memory for admin-cache (in MB).
   maxItemMemory: 1
 
+  # -- Maximum number of connections allowed
+  connectionLimit: 16384
+
   # -- Extra init containers for admin-cache pods
   initContainers: []
 

diff --git a/...e-configmap-values-generated/mimir-distributed/templates/admin-cache/admin-cache-pdb.yaml b/...e-configmap-values-generated/mimir-distributed/templates/admin-cache/admin-cache-pdb.yaml
@@ -0,0 +1,19 @@
+---
+# Source: mimir-distributed/templates/admin-cache/admin-cache-pdb.yaml
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: test-enterprise-configmap-values-mimir-admin-cache
+  labels:
+    app.kubernetes.io/name: mimir
+    app.kubernetes.io/instance: test-enterprise-configmap-values
+    app.kubernetes.io/component: admin-cache
+    app.kubernetes.io/managed-by: Helm
+  namespace: "citestns"
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: mimir
+      app.kubernetes.io/instance: test-enterprise-configmap-values
+      app.kubernetes.io/component: admin-cache
+  maxUnavailable: 1
diff --git a/...map-values-generated/mimir-distributed/templates/admin-cache/admin-cache-statefulset.yaml b/...map-values-generated/mimir-distributed/templates/admin-cache/admin-cache-statefulset.yaml
@@ -0,0 +1,100 @@
+---
+# Source: mimir-distributed/templates/admin-cache/admin-cache-statefulset.yaml
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-enterprise-configmap-values-mimir-admin-cache
+  labels:
+    app.kubernetes.io/name: mimir
+    app.kubernetes.io/instance: test-enterprise-configmap-values
+    app.kubernetes.io/component: memcached
+    app.kubernetes.io/managed-by: Helm
+  annotations:
+    {}
+  namespace: "citestns"
+spec:
+  podManagementPolicy: Parallel
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: mimir
+      app.kubernetes.io/instance: test-enterprise-configmap-values
+      app.kubernetes.io/component: admin-cache
+  updateStrategy:
+    type: RollingUpdate
+  serviceName: test-enterprise-configmap-values-mimir-admin-cache
+
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: mimir
+        app.kubernetes.io/instance: test-enterprise-configmap-values
+        app.kubernetes.io/managed-by: Helm
+        app.kubernetes.io/component: admin-cache
+      annotations:
+        minio-secret-version: "42"
+
+    spec:
+      serviceAccountName: test-enterprise-configmap-values-mimir
+      securityContext:
+        fsGroup: 10001
+        runAsGroup: 10001
+        runAsNonRoot: true
+        runAsUser: 10001
+        seccompProfile:
+          type: RuntimeDefault
+      initContainers:
+        []
+      nodeSelector:
+        {}
+      affinity:
+        {}
+
+      tolerations:
+        []
+      terminationGracePeriodSeconds: 60
+      containers:
+        - name: memcached
+          image: memcached:1.6.22-alpine
+          imagePullPolicy: IfNotPresent
+          resources:
+            limits: null
+            requests: null
+          ports:
+            - containerPort: 11211
+              name: client
+          args:
+            - -m 64
+            - --extended=modern,track_sizes
+            - -I 1m
+            - -c 16384
+            - -v
+            - -u 11211
+          env:
+          envFrom:
+            - secretRef:
+                name: mimir-minio-secret
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+        - name: exporter
+          image: prom/memcached-exporter:v0.14.2
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 9150
+              name: http-metrics
+          args:
+            - "--memcached.address=localhost:11211"
+            - "--web.listen-address=0.0.0.0:9150"
+          resources:
+            limits: {}
+            requests: {}
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
diff --git a/...ap-values-generated/mimir-distributed/templates/admin-cache/admin-cache-svc-headless.yaml b/...ap-values-generated/mimir-distributed/templates/admin-cache/admin-cache-svc-headless.yaml
@@ -0,0 +1,30 @@
+---
+# Source: mimir-distributed/templates/admin-cache/admin-cache-svc-headless.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: test-enterprise-configmap-values-mimir-admin-cache
+  labels:
+    app.kubernetes.io/name: mimir
+    app.kubernetes.io/instance: test-enterprise-configmap-values
+    app.kubernetes.io/component: admin-cache
+    app.kubernetes.io/managed-by: Helm
+  annotations:
+    {}
+  namespace: "citestns"
+spec:
+  type: ClusterIP
+  clusterIP: None
+  ports:
+    - name: memcached-client
+      port: 11211
+      targetPort: 11211
+
+    - name: http-metrics
+      port: 9150
+      targetPort: 9150
+
+  selector:
+    app.kubernetes.io/name: mimir
+    app.kubernetes.io/instance: test-enterprise-configmap-values
+    app.kubernetes.io/component: admin-cache
diff --git a/...configmap-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-pdb.yaml b/...configmap-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-pdb.yaml
@@ -0,0 +1,19 @@
+---
+# Source: mimir-distributed/templates/chunks-cache/chunks-cache-pdb.yaml
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: test-enterprise-configmap-values-mimir-chunks-cache
+  labels:
+    app.kubernetes.io/name: mimir
+    app.kubernetes.io/instance: test-enterprise-configmap-values
+    app.kubernetes.io/component: chunks-cache
+    app.kubernetes.io/managed-by: Helm
+  namespace: "citestns"
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: mimir
+      app.kubernetes.io/instance: test-enterprise-configmap-values
+      app.kubernetes.io/component: chunks-cache
+  maxUnavailable: 1
diff --git a/...p-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-statefulset.yaml b/...p-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-statefulset.yaml
@@ -0,0 +1,100 @@
+---
+# Source: mimir-distributed/templates/chunks-cache/chunks-cache-statefulset.yaml
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-enterprise-configmap-values-mimir-chunks-cache
+  labels:
+    app.kubernetes.io/name: mimir
+    app.kubernetes.io/instance: test-enterprise-configmap-values
+    app.kubernetes.io/component: memcached
+    app.kubernetes.io/managed-by: Helm
+  annotations:
+    {}
+  namespace: "citestns"
+spec:
+  podManagementPolicy: Parallel
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: mimir
+      app.kubernetes.io/instance: test-enterprise-configmap-values
+      app.kubernetes.io/component: chunks-cache
+  updateStrategy:
+    type: RollingUpdate
+  serviceName: test-enterprise-configmap-values-mimir-chunks-cache
+
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: mimir
+        app.kubernetes.io/instance: test-enterprise-configmap-values
+        app.kubernetes.io/managed-by: Helm
+        app.kubernetes.io/component: chunks-cache
+      annotations:
+        minio-secret-version: "42"
+
+    spec:
+      serviceAccountName: test-enterprise-configmap-values-mimir
+      securityContext:
+        fsGroup: 10001
+        runAsGroup: 10001
+        runAsNonRoot: true
+        runAsUser: 10001
+        seccompProfile:
+          type: RuntimeDefault
+      initContainers:
+        []
+      nodeSelector:
+        {}
+      affinity:
+        {}
+
+      tolerations:
+        []
+      terminationGracePeriodSeconds: 60
+      containers:
+        - name: memcached
+          image: memcached:1.6.22-alpine
+          imagePullPolicy: IfNotPresent
+          resources:
+            limits: null
+            requests: null
+          ports:
+            - containerPort: 11211
+              name: client
+          args:
+            - -m 8192
+            - --extended=modern,track_sizes
+            - -I 1m
+            - -c 16384
+            - -v
+            - -u 11211
+          env:
+          envFrom:
+            - secretRef:
+                name: mimir-minio-secret
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+        - name: exporter
+          image: prom/memcached-exporter:v0.14.2
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 9150
+              name: http-metrics
+          args:
+            - "--memcached.address=localhost:11211"
+            - "--web.listen-address=0.0.0.0:9150"
+          resources:
+            limits: {}
+            requests: {}
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
diff --git a/...-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-svc-headless.yaml b/...-values-generated/mimir-distributed/templates/chunks-cache/chunks-cache-svc-headless.yaml
@@ -0,0 +1,30 @@
+---
+# Source: mimir-distributed/templates/chunks-cache/chunks-cache-svc-headless.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: test-enterprise-configmap-values-mimir-chunks-cache
+  labels:
+    app.kubernetes.io/name: mimir
+    app.kubernetes.io/instance: test-enterprise-configmap-values
+    app.kubernetes.io/component: chunks-cache
+    app.kubernetes.io/managed-by: Helm
+  annotations:
+    {}
+  namespace: "citestns"
+spec:
+  type: ClusterIP
+  clusterIP: None
+  ports:
+    - name: memcached-client
+      port: 11211
+      targetPort: 11211
+
+    - name: http-metrics
+      port: 9150
+      targetPort: 9150
+
+  selector:
+    app.kubernetes.io/name: mimir
+    app.kubernetes.io/instance: test-enterprise-configmap-values
+    app.kubernetes.io/component: chunks-cache