diff --git a/CHANGELOG.md b/CHANGELOG.md index adfa020dc6f..3b773162fce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -85,6 +85,7 @@ Querying with using `{__mimir_storage__="ephemeral"}` selector no longer works. * [CHANGE] Create the `query-frontend-discovery` service only when Mimir is deployed in microservice mode without query-scheduler. #4353 * [CHANGE] Add results cache backend config to `ruler-query-frontend` configuration to allow cache reuse for cardinality-estimation based sharding. #4257 +* [CHANGE] Ruler: changed ruler deployment max surge from `0` to `50%`, and max unavailable from `1` to `0`. #4381 * [ENHANCEMENT] Add support for ruler auto-scaling. #4046 * [ENHANCEMENT] Add optional `weight` param to `newQuerierScaledObject` and `newRulerQuerierScaledObject` to allow running multiple querier deployments on different node types. #4141 * [ENHANCEMENT] Add support for query-frontend and ruler-query-frontend auto-scaling. #4199 diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md index 2fbcf33d4b5..e5f7849f92e 100644 --- a/operations/helm/charts/mimir-distributed/CHANGELOG.md +++ b/operations/helm/charts/mimir-distributed/CHANGELOG.md @@ -28,6 +28,7 @@ Entries should include a reference to the Pull Request that introduced the chang ## main / unreleased +* [CHANGE] Ruler: changed ruler deployment max surge from `0` to `50%`, and max unavailable from `1` to `0`. #4381 * [ENHANCEMENT] Support autoscaling/v2 HorizontalPodAutoscaler for nginx autoscaling starting with Kubernetes 1.23. #4285 * [BUGFIX] Allow override of Kubernetes version for nginx HPA. #4299 * [BUGFIX] Do not generate query-frontend-headless service if query scheduler is enabled. Fixes parity with jsonnet. #4353 diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml index 7e061a1790b..41e92041a78 100644 --- a/operations/helm/charts/mimir-distributed/values.yaml +++ b/operations/helm/charts/mimir-distributed/values.yaml @@ -1015,8 +1015,8 @@ ruler: strategy: type: RollingUpdate rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 terminationGracePeriodSeconds: 180 diff --git a/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index 63cf6616689..8d6b7cfa5fa 100644 --- a/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/gateway-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index 20e581e3911..c4e57fd497e 100644 --- a/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/gateway-nginx-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index b5c63927c41..e2b7590490a 100644 --- a/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/graphite-enabled-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/large-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/large-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index f3e3e8c1eee..ce13736a980 100644 --- a/operations/helm/tests/large-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/large-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index d4a2dda1350..b9982a984c1 100644 --- a/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/metamonitoring-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index 40d316cef27..f4b4742716b 100644 --- a/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/scheduler-name-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/small-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/small-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index 350c3cab40d..f0756f4ff0b 100644 --- a/operations/helm/tests/small-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/small-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index 092ea229a8e..7d641c9d16e 100644 --- a/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/test-enterprise-configmap-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index 8f43a0c45bc..03b41d38042 100644 --- a/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/test-enterprise-k8s-1.25-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index 3b8df782fad..011bbaf841d 100644 --- a/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/test-enterprise-legacy-label-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -19,8 +19,8 @@ spec: release: test-enterprise-legacy-label-values strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index eb6abda8efb..070a44e60ce 100644 --- a/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/test-enterprise-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index 897bffb3224..011ca0a0262 100644 --- a/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index 3c67a3306be..55013d39b2c 100644 --- a/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/test-oss-logical-multizone-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index ae47edd9992..540bef0dcb4 100644 --- a/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/test-oss-multizone-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml index 9b0b396e93a..5d00abfb599 100644 --- a/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml +++ b/operations/helm/tests/test-oss-values-generated/mimir-distributed/templates/ruler/ruler-dep.yaml @@ -22,8 +22,8 @@ spec: app.kubernetes.io/component: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 type: RollingUpdate template: metadata: diff --git a/operations/mimir-tests/test-autoscaling-generated.yaml b/operations/mimir-tests/test-autoscaling-generated.yaml index 3682d944c50..0e8be418a11 100644 --- a/operations/mimir-tests/test-autoscaling-generated.yaml +++ b/operations/mimir-tests/test-autoscaling-generated.yaml @@ -750,8 +750,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-consul-generated.yaml b/operations/mimir-tests/test-consul-generated.yaml index beeab61848f..70802a75810 100644 --- a/operations/mimir-tests/test-consul-generated.yaml +++ b/operations/mimir-tests/test-consul-generated.yaml @@ -1042,8 +1042,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-consul-multi-zone-generated.yaml b/operations/mimir-tests/test-consul-multi-zone-generated.yaml index 74b9cbcd06b..47026f021a2 100644 --- a/operations/mimir-tests/test-consul-multi-zone-generated.yaml +++ b/operations/mimir-tests/test-consul-multi-zone-generated.yaml @@ -1240,8 +1240,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-deployment-mode-migration-generated.yaml b/operations/mimir-tests/test-deployment-mode-migration-generated.yaml index 8476ba23779..4544897da4c 100644 --- a/operations/mimir-tests/test-deployment-mode-migration-generated.yaml +++ b/operations/mimir-tests/test-deployment-mode-migration-generated.yaml @@ -1269,8 +1269,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml b/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml index 9e1d3d215b7..9f17d7a86bb 100644 --- a/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml +++ b/operations/mimir-tests/test-disable-chunk-streaming-generated.yaml @@ -676,8 +676,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-extra-runtime-config-generated.yaml b/operations/mimir-tests/test-extra-runtime-config-generated.yaml index aa697f4ae7f..71b0ce036e3 100644 --- a/operations/mimir-tests/test-extra-runtime-config-generated.yaml +++ b/operations/mimir-tests/test-extra-runtime-config-generated.yaml @@ -703,8 +703,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-helm-parity-generated.yaml b/operations/mimir-tests/test-helm-parity-generated.yaml index 39c1ad29389..c5c5318b84c 100644 --- a/operations/mimir-tests/test-helm-parity-generated.yaml +++ b/operations/mimir-tests/test-helm-parity-generated.yaml @@ -760,8 +760,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-0-before-generated.yaml b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-0-before-generated.yaml index 7e94e8f994c..3255a3f7e14 100644 --- a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-0-before-generated.yaml +++ b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-0-before-generated.yaml @@ -675,8 +675,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-1-generated.yaml b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-1-generated.yaml index 43a89680448..a991b5ebe9d 100644 --- a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-1-generated.yaml +++ b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-1-generated.yaml @@ -677,8 +677,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-2-generated.yaml b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-2-generated.yaml index 5d4407c5fca..896817a1257 100644 --- a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-2-generated.yaml +++ b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-2-generated.yaml @@ -679,8 +679,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-3-generated.yaml b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-3-generated.yaml index 7fafdf4f204..7872fa29399 100644 --- a/operations/mimir-tests/test-memberlist-cluster-label-migration-step-3-generated.yaml +++ b/operations/mimir-tests/test-memberlist-cluster-label-migration-step-3-generated.yaml @@ -677,8 +677,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-memberlist-migration-step-0-before-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-0-before-generated.yaml index beeab61848f..70802a75810 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-0-before-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-0-before-generated.yaml @@ -1042,8 +1042,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-memberlist-migration-step-1-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-1-generated.yaml index 661cc9144d8..b2ff0f95b8a 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-1-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-1-generated.yaml @@ -1096,8 +1096,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-memberlist-migration-step-2-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-2-generated.yaml index 515e9aaf89f..c24b328938a 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-2-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-2-generated.yaml @@ -1096,8 +1096,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-memberlist-migration-step-3-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-3-generated.yaml index 10d2bb7085c..363e90dbdbf 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-3-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-3-generated.yaml @@ -1096,8 +1096,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-memberlist-migration-step-4-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-4-generated.yaml index c1c0d81376c..e0c8adba427 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-4-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-4-generated.yaml @@ -1096,8 +1096,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-memberlist-migration-step-5-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-5-generated.yaml index 2005a0d1e54..5f3e1b19e20 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-5-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-5-generated.yaml @@ -678,8 +678,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-memberlist-migration-step-6-final-generated.yaml b/operations/mimir-tests/test-memberlist-migration-step-6-final-generated.yaml index 7e94e8f994c..3255a3f7e14 100644 --- a/operations/mimir-tests/test-memberlist-migration-step-6-final-generated.yaml +++ b/operations/mimir-tests/test-memberlist-migration-step-6-final-generated.yaml @@ -675,8 +675,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-multi-zone-generated.yaml b/operations/mimir-tests/test-multi-zone-generated.yaml index 98750fd1f55..6b54638d787 100644 --- a/operations/mimir-tests/test-multi-zone-generated.yaml +++ b/operations/mimir-tests/test-multi-zone-generated.yaml @@ -885,8 +885,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-multi-zone-with-ongoing-migration-generated.yaml b/operations/mimir-tests/test-multi-zone-with-ongoing-migration-generated.yaml index 0098beee343..0ede092f09c 100644 --- a/operations/mimir-tests/test-multi-zone-with-ongoing-migration-generated.yaml +++ b/operations/mimir-tests/test-multi-zone-with-ongoing-migration-generated.yaml @@ -953,8 +953,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-query-scheduler-consul-ring-generated.yaml b/operations/mimir-tests/test-query-scheduler-consul-ring-generated.yaml index fe54a4aacc0..812a8fcc917 100644 --- a/operations/mimir-tests/test-query-scheduler-consul-ring-generated.yaml +++ b/operations/mimir-tests/test-query-scheduler-consul-ring-generated.yaml @@ -1052,8 +1052,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-query-scheduler-memberlist-ring-and-ruler-remote-evaluation-generated.yaml b/operations/mimir-tests/test-query-scheduler-memberlist-ring-and-ruler-remote-evaluation-generated.yaml index d92fd26458b..ac08da5af5c 100644 --- a/operations/mimir-tests/test-query-scheduler-memberlist-ring-and-ruler-remote-evaluation-generated.yaml +++ b/operations/mimir-tests/test-query-scheduler-memberlist-ring-and-ruler-remote-evaluation-generated.yaml @@ -789,8 +789,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-query-scheduler-memberlist-ring-generated.yaml b/operations/mimir-tests/test-query-scheduler-memberlist-ring-generated.yaml index 0170db3b774..68c78a4c68b 100644 --- a/operations/mimir-tests/test-query-scheduler-memberlist-ring-generated.yaml +++ b/operations/mimir-tests/test-query-scheduler-memberlist-ring-generated.yaml @@ -702,8 +702,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-query-scheduler-memberlist-ring-read-path-disabled-generated.yaml b/operations/mimir-tests/test-query-scheduler-memberlist-ring-read-path-disabled-generated.yaml index 81a5326865a..214288dbc3d 100644 --- a/operations/mimir-tests/test-query-scheduler-memberlist-ring-read-path-disabled-generated.yaml +++ b/operations/mimir-tests/test-query-scheduler-memberlist-ring-read-path-disabled-generated.yaml @@ -690,8 +690,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-query-sharding-generated.yaml b/operations/mimir-tests/test-query-sharding-generated.yaml index 2769568edf4..d502188965f 100644 --- a/operations/mimir-tests/test-query-sharding-generated.yaml +++ b/operations/mimir-tests/test-query-sharding-generated.yaml @@ -680,8 +680,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-ruler-remote-evaluation-generated.yaml b/operations/mimir-tests/test-ruler-remote-evaluation-generated.yaml index 9659e154791..4c0df50d519 100644 --- a/operations/mimir-tests/test-ruler-remote-evaluation-generated.yaml +++ b/operations/mimir-tests/test-ruler-remote-evaluation-generated.yaml @@ -753,8 +753,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-ruler-remote-evaluation-migration-generated.yaml b/operations/mimir-tests/test-ruler-remote-evaluation-migration-generated.yaml index e26758a4617..78c98463829 100644 --- a/operations/mimir-tests/test-ruler-remote-evaluation-migration-generated.yaml +++ b/operations/mimir-tests/test-ruler-remote-evaluation-migration-generated.yaml @@ -753,8 +753,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-shuffle-sharding-generated.yaml b/operations/mimir-tests/test-shuffle-sharding-generated.yaml index 2bc5befaf3e..2459dca82c0 100644 --- a/operations/mimir-tests/test-shuffle-sharding-generated.yaml +++ b/operations/mimir-tests/test-shuffle-sharding-generated.yaml @@ -680,8 +680,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-shuffle-sharding-read-path-disabled-generated.yaml b/operations/mimir-tests/test-shuffle-sharding-read-path-disabled-generated.yaml index a892cada1fd..54a04335253 100644 --- a/operations/mimir-tests/test-shuffle-sharding-read-path-disabled-generated.yaml +++ b/operations/mimir-tests/test-shuffle-sharding-read-path-disabled-generated.yaml @@ -680,8 +680,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-storage-azure-generated.yaml b/operations/mimir-tests/test-storage-azure-generated.yaml index d56f975fce9..1077c71b8ed 100644 --- a/operations/mimir-tests/test-storage-azure-generated.yaml +++ b/operations/mimir-tests/test-storage-azure-generated.yaml @@ -677,8 +677,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-storage-gcs-generated.yaml b/operations/mimir-tests/test-storage-gcs-generated.yaml index 7e94e8f994c..3255a3f7e14 100644 --- a/operations/mimir-tests/test-storage-gcs-generated.yaml +++ b/operations/mimir-tests/test-storage-gcs-generated.yaml @@ -675,8 +675,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir-tests/test-storage-s3-generated.yaml b/operations/mimir-tests/test-storage-s3-generated.yaml index 2c6440a6cd3..ebca9003d01 100644 --- a/operations/mimir-tests/test-storage-s3-generated.yaml +++ b/operations/mimir-tests/test-storage-s3-generated.yaml @@ -676,8 +676,8 @@ spec: name: ruler strategy: rollingUpdate: - maxSurge: 0 - maxUnavailable: 1 + maxSurge: 50% + maxUnavailable: 0 template: metadata: labels: diff --git a/operations/mimir/ruler.libsonnet b/operations/mimir/ruler.libsonnet index da0b698c87e..418c749c0df 100644 --- a/operations/mimir/ruler.libsonnet +++ b/operations/mimir/ruler.libsonnet @@ -48,8 +48,8 @@ deployment.new(name, 2, [$.ruler_container]) + (if !std.isObject($._config.node_selector) then {} else deployment.mixin.spec.template.spec.withNodeSelectorMixin($._config.node_selector)) + - deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge(0) + - deployment.mixin.spec.strategy.rollingUpdate.withMaxUnavailable(1) + + deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge('50%') + + deployment.mixin.spec.strategy.rollingUpdate.withMaxUnavailable(0) + deployment.mixin.spec.template.spec.withTerminationGracePeriodSeconds(600) + $.newMimirSpreadTopology(name, $._config.querier_topology_spread_max_skew) + $.mimirVolumeMounts,