Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

helm: sync server.grpc.keepalive.max-connection-idle with jsonnet #7298

Merged
merged 1 commit into from
Feb 5, 2024
Merged

helm: sync server.grpc.keepalive.max-connection-idle with jsonnet #7298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions operations/compare-helm-with-jsonnet/components/config/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions operations/helm/charts/mimir-distributed/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions operations/helm/charts/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions operations/helm/charts/mimir-distributed/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...prise-https-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ...elm/tests/enterprise-https-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...-enterprise-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ...m/tests/gateway-enterprise-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...teway-nginx-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ...s/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...ite-enabled-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ...elm/tests/graphite-enabled-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...tests/large-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions operations/helm/tests/large-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...amonitoring-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .../helm/tests/metamonitoring-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...s/openshift-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ...tions/helm/tests/openshift-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...eduler-name-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .../helm/tests/scheduler-name-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...tests/small-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions operations/helm/tests/small-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...e-configmap-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .../test-enterprise-configmap-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...se-k8s-1.25-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ...s/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/mimir-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...egacy-label-values-generated/mimir-distributed/templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading