helm: remove -server.grpc.keepalive.max-connection-idle from common c…

…onfig Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>
grafana · Feb 5, 2024 · 793cda6 · 793cda6
1 parent a318544
commit 793cda6
Show file tree

Hide file tree

Showing 44 changed files with 24 additions and 48 deletions.
diff --git a/operations/compare-helm-with-jsonnet/components/config/kustomization.yaml b/operations/compare-helm-with-jsonnet/components/config/kustomization.yaml
@@ -148,14 +148,6 @@ patches:
       - op: remove
         path: /config/limits/max_total_query_length
 
-  - target:
-      kind: MimirConfig
-      name: 'alertmanager|compactor|ingester|overrides-exporter|querier|query-frontend|query-scheduler|ruler|store-gateway'
-    patch: |-
-      # Only applied to distributors in jsonnet, remove from the rest
-      - op: remove
-        path: /config/server/grpc_server_max_connection_idle
-
   - target:
       kind: MimirConfig
       name: 'alertmanager|compactor|distributor|ingester|overrides-exporter|querier|query-frontend|query-scheduler|ruler|store-gateway'

diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -40,6 +40,7 @@ Entries should include a reference to the Pull Request that introduced the chang
   * `-compactor.ring.heartbeat-timeout` set to `4m`
 * [CHANGE] Ruler: Set `-distributor.remote-timeout` to 10s in order to accommodate writing large rule results to the ingester. #7143
 * [CHANGE] Remove `-server.grpc.keepalive.max-connection-age` and `-server.grpc.keepalive.max-connection-age-grace` from default config. The configuration now applied directly to distributor, fixing parity with jsonnet. #7269
+* [CHANGE] Remove `-server.grpc.keepalive.max-connection-idle` from default config. The configuration now applied directly to distributor, fixing parity with jsonnet. #7298
 * [ENHANCEMENT] Add `jaegerReporterMaxQueueSize` Helm value for all components where configuring `JAEGER_REPORTER_MAX_QUEUE_SIZE` makes sense, and override the Jaeger client's default value of 100 for components expected to generate many trace spans. #7068 #7086 #7259
 * [ENHANCEMENT] Rollout-operator: upgraded to v0.10.1. #7125
 * [ENHANCEMENT] Query-frontend: configured `-shutdown-delay`, `-server.grpc.keepalive.max-connection-age` and termination grace period to reduce the likelihood of queries hitting terminated query-frontends. #7129

diff --git a/operations/helm/charts/mimir-distributed/templates/distributor/distributor-dep.yaml b/operations/helm/charts/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -50,6 +50,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           {{- if .Values.ingester.zoneAwareReplication.migration.enabled }}
             {{- if not .Values.ingester.zoneAwareReplication.migration.writePath }}
             - "-ingester.ring.zone-awareness-enabled=false"

diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
@@ -374,9 +374,6 @@ mimir:
     runtime_config:
       file: /var/{{ include "mimir.name" . }}/runtime.yaml
 
-    server:
-      grpc_server_max_connection_idle: 1m
-
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m

diff --git a/...prise-https-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/...prise-https-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
 
             - mountPath: /certs

diff --git a/...elm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml b/...elm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -286,7 +286,6 @@ data:
     runtime_config:
       file: /var/mimir/runtime.yaml
     server:
-      grpc_server_max_connection_idle: 1m
       grpc_tls_config:
         cert_file: /certs/tls.crt
         client_auth_type: VerifyClientCertIfGiven

diff --git a/...-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/...-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir

diff --git a/...m/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml b/...m/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -148,8 +148,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m

diff --git a/...teway-nginx-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/...teway-nginx-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir

diff --git a/...s/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml b/...s/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -104,8 +104,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m

diff --git a/...ite-enabled-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/...ite-enabled-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir

diff --git a/...elm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml b/...elm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -171,8 +171,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m

diff --git a/...tests/large-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/...tests/large-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir

diff --git a/operations/helm/tests/large-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/large-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -116,8 +116,6 @@ data:
           max_item_size: 1048576
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m

diff --git a/...amonitoring-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/...amonitoring-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir

diff --git a/.../helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml b/.../helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -103,8 +103,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m

diff --git a/...s/openshift-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/...s/openshift-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -54,6 +54,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir

diff --git a/...tions/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml b/...tions/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -119,8 +119,6 @@ data:
       rule_path: /data
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m

diff --git a/...eduler-name-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/...eduler-name-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir

diff --git a/.../helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml b/.../helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -82,8 +82,6 @@ data:
       rule_path: /data
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m

diff --git a/...tests/small-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/...tests/small-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir

diff --git a/operations/helm/tests/small-values-generated/mimir-distributed/templates/mimir-config.yaml b/operations/helm/tests/small-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -116,8 +116,6 @@ data:
           max_item_size: 1048576
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m

diff --git a/...e-configmap-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/...e-configmap-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -58,6 +58,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir

diff --git a/.../test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml b/.../test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -147,8 +147,6 @@ data:
         secret_access_key: ${MINIO_ROOT_PASSWORD}
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m

diff --git a/...se-k8s-1.25-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/...se-k8s-1.25-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -57,6 +57,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir

diff --git a/...s/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml b/...s/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml
@@ -148,8 +148,6 @@ data:
         secret_access_key: supersecret
     runtime_config:
       file: /var/mimir/runtime.yaml
-    server:
-      grpc_server_max_connection_idle: 1m
     store_gateway:
       sharding_ring:
         heartbeat_period: 1m

diff --git a/...egacy-label-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml b/...egacy-label-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
@@ -54,6 +54,7 @@ spec:
             # Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
             - "-server.grpc.keepalive.max-connection-age=2m"
             - "-server.grpc.keepalive.max-connection-age-grace=5m"
+            - "-server.grpc.keepalive.max-connection-idle=1m"
           volumeMounts:
             - name: config
               mountPath: /etc/mimir