From cb0e01072eecf572837e0e6e442179e684cf8f86 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Mon, 28 Mar 2022 10:07:48 +0200 Subject: [PATCH] Jsonnet: remove cortex_ prefix from settings Signed-off-by: Marco Pracucci --- CHANGELOG.md | 2 +- .../test-gossip-multi-zone.jsonnet | 8 +- ...-multi-zone-with-ongoing-migration.jsonnet | 12 +-- .../mimir-tests/test-multi-zone.jsonnet | 8 +- operations/mimir/config.libsonnet | 1 - operations/mimir/memberlist.libsonnet | 16 +-- operations/mimir/multi-zone.libsonnet | 102 +++++++++--------- 7 files changed, 74 insertions(+), 75 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcbdd299ce2..a97f3cbfbe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -847,7 +847,7 @@ _Changes since `grafana/cortex-jsonnet` `1.9.0`._ }, } ``` -* [FEATURE] Added multi-zone ingesters and store-gateways support. #1352 +* [FEATURE] Added multi-zone ingesters and store-gateways support. #1352 #1552 * [ENHANCEMENT] Add overrides config to compactor. This allows setting retention configs per user. [#386](https://github.com/grafana/cortex-jsonnet/pull/386) * [ENHANCEMENT] Added 256MB memory ballast to querier. [#369](https://github.com/grafana/cortex-jsonnet/pull/369) * [ENHANCEMENT] Update `etcd-operator` to latest version (see https://github.com/grafana/jsonnet-libs/pull/480). [#263](https://github.com/grafana/cortex-jsonnet/pull/263) diff --git a/operations/mimir-tests/test-gossip-multi-zone.jsonnet b/operations/mimir-tests/test-gossip-multi-zone.jsonnet index 00f9cb5db00..15b534a8d81 100644 --- a/operations/mimir-tests/test-gossip-multi-zone.jsonnet +++ b/operations/mimir-tests/test-gossip-multi-zone.jsonnet @@ -20,10 +20,10 @@ mimir { alertmanager_client_type: 'gcs', alertmanager_gcs_bucket_name: 'alerts-bucket', - cortex_multi_zone_ingester_enabled: true, - cortex_multi_zone_ingester_replicas: 3, + multi_zone_ingester_enabled: true, + multi_zone_ingester_replicas: 3, - cortex_multi_zone_store_gateway_enabled: true, - cortex_multi_zone_store_gateway_replicas: 3, + multi_zone_store_gateway_enabled: true, + multi_zone_store_gateway_replicas: 3, }, } diff --git a/operations/mimir-tests/test-multi-zone-with-ongoing-migration.jsonnet b/operations/mimir-tests/test-multi-zone-with-ongoing-migration.jsonnet index 5f7357995d5..d30652ec4cc 100644 --- a/operations/mimir-tests/test-multi-zone-with-ongoing-migration.jsonnet +++ b/operations/mimir-tests/test-multi-zone-with-ongoing-migration.jsonnet @@ -18,12 +18,12 @@ mimir { alertmanager_client_type: 'gcs', alertmanager_gcs_bucket_name: 'alerts-bucket', - cortex_multi_zone_ingester_enabled: true, - cortex_multi_zone_ingester_migration_enabled: true, - cortex_multi_zone_ingester_replicas: 3, + multi_zone_ingester_enabled: true, + multi_zone_ingester_migration_enabled: true, + multi_zone_ingester_replicas: 3, - cortex_multi_zone_store_gateway_enabled: true, - cortex_multi_zone_store_gateway_migration_enabled: true, - cortex_multi_zone_store_gateway_replicas: 3, + multi_zone_store_gateway_enabled: true, + multi_zone_store_gateway_migration_enabled: true, + multi_zone_store_gateway_replicas: 3, }, } diff --git a/operations/mimir-tests/test-multi-zone.jsonnet b/operations/mimir-tests/test-multi-zone.jsonnet index 660c473dee5..7ab4c50ce2b 100644 --- a/operations/mimir-tests/test-multi-zone.jsonnet +++ b/operations/mimir-tests/test-multi-zone.jsonnet @@ -18,10 +18,10 @@ mimir { alertmanager_client_type: 'gcs', alertmanager_gcs_bucket_name: 'alerts-bucket', - cortex_multi_zone_ingester_enabled: true, - cortex_multi_zone_ingester_replicas: 3, + multi_zone_ingester_enabled: true, + multi_zone_ingester_replicas: 3, - cortex_multi_zone_store_gateway_enabled: true, - cortex_multi_zone_store_gateway_replicas: 3, + multi_zone_store_gateway_enabled: true, + multi_zone_store_gateway_replicas: 3, }, } diff --git a/operations/mimir/config.libsonnet b/operations/mimir/config.libsonnet index 81766f0c0c0..eedc32beaa5 100644 --- a/operations/mimir/config.libsonnet +++ b/operations/mimir/config.libsonnet @@ -59,7 +59,6 @@ compactor_cleanup_interval: '15m', // Enable use of bucket index by querier, ruler and store-gateway. - // Bucket index is generated by compactor from Cortex 1.7, there is no flag required to enable this on compactor. bucket_index_enabled: true, store_gateway_replication_factor: 3, diff --git a/operations/mimir/memberlist.libsonnet b/operations/mimir/memberlist.libsonnet index 96dfeb2d5b0..9994b97704d 100644 --- a/operations/mimir/memberlist.libsonnet +++ b/operations/mimir/memberlist.libsonnet @@ -70,32 +70,32 @@ distributor_deployment+: if !$._config.memberlist_ring_enabled then {} else gossipLabel, - ingester_statefulset: if $._config.cortex_multi_zone_ingester_enabled && !$._config.cortex_multi_zone_ingester_migration_enabled then null else + ingester_statefulset: if $._config.multi_zone_ingester_enabled && !$._config.multi_zone_ingester_migration_enabled then null else (super.ingester_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel), - ingester_zone_a_statefulset: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_zone_a_statefulset: if !$._config.multi_zone_ingester_enabled then null else (super.ingester_zone_a_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel), - ingester_zone_b_statefulset: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_zone_b_statefulset: if !$._config.multi_zone_ingester_enabled then null else (super.ingester_zone_b_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel), - ingester_zone_c_statefulset: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_zone_c_statefulset: if !$._config.multi_zone_ingester_enabled then null else (super.ingester_zone_c_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel), querier_deployment+: if !$._config.memberlist_ring_enabled then {} else gossipLabel, ruler_deployment+: if !$._config.memberlist_ring_enabled || !$._config.ruler_enabled then {} else gossipLabel, - store_gateway_statefulset: if $._config.cortex_multi_zone_store_gateway_enabled && !$._config.cortex_multi_zone_store_gateway_migration_enabled then null else + store_gateway_statefulset: if $._config.multi_zone_store_gateway_enabled && !$._config.multi_zone_store_gateway_migration_enabled then null else (super.store_gateway_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel), - store_gateway_zone_a_statefulset: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_zone_a_statefulset: if !$._config.multi_zone_store_gateway_enabled then null else (super.store_gateway_zone_a_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel), - store_gateway_zone_b_statefulset: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_zone_b_statefulset: if !$._config.multi_zone_store_gateway_enabled then null else (super.store_gateway_zone_b_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel), - store_gateway_zone_c_statefulset: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_zone_c_statefulset: if !$._config.multi_zone_store_gateway_enabled then null else (super.store_gateway_zone_c_statefulset + if !$._config.memberlist_ring_enabled then {} else gossipLabel), // Headless service (= no assigned IP, DNS returns all targets instead) pointing to gossip network members. diff --git a/operations/mimir/multi-zone.libsonnet b/operations/mimir/multi-zone.libsonnet index ada14851e00..11702578596 100644 --- a/operations/mimir/multi-zone.libsonnet +++ b/operations/mimir/multi-zone.libsonnet @@ -13,22 +13,22 @@ local podAntiAffinity = deployment.mixin.spec.template.spec.affinity.podAntiAffinity, _config+: { - cortex_multi_zone_ingester_enabled: false, - cortex_multi_zone_ingester_migration_enabled: false, - cortex_multi_zone_ingester_replication_write_path_enabled: true, - cortex_multi_zone_ingester_replication_read_path_enabled: true, - cortex_multi_zone_ingester_replicas: 0, - cortex_multi_zone_ingester_max_unavailable: 10, - - cortex_multi_zone_store_gateway_enabled: false, - cortex_multi_zone_store_gateway_read_path_enabled: $._config.cortex_multi_zone_store_gateway_enabled, - cortex_multi_zone_store_gateway_migration_enabled: false, - cortex_multi_zone_store_gateway_replicas: 0, - cortex_multi_zone_store_gateway_max_unavailable: 10, + multi_zone_ingester_enabled: false, + multi_zone_ingester_migration_enabled: false, + multi_zone_ingester_replication_write_path_enabled: true, + multi_zone_ingester_replication_read_path_enabled: true, + multi_zone_ingester_replicas: 0, + multi_zone_ingester_max_unavailable: 10, + + multi_zone_store_gateway_enabled: false, + multi_zone_store_gateway_read_path_enabled: $._config.multi_zone_store_gateway_enabled, + multi_zone_store_gateway_migration_enabled: false, + multi_zone_store_gateway_replicas: 0, + multi_zone_store_gateway_max_unavailable: 10, // We can update the queryBlocksStorageConfig only once the migration is over. During the migration // we don't want to apply these changes to single-zone store-gateways too. - queryBlocksStorageConfig+:: if !$._config.cortex_multi_zone_store_gateway_enabled || !$._config.cortex_multi_zone_store_gateway_read_path_enabled || $._config.cortex_multi_zone_store_gateway_migration_enabled then {} else { + queryBlocksStorageConfig+:: if !$._config.multi_zone_store_gateway_enabled || !$._config.multi_zone_store_gateway_read_path_enabled || $._config.multi_zone_store_gateway_migration_enabled then {} else { 'store-gateway.sharding-ring.zone-awareness-enabled': 'true', 'store-gateway.sharding-ring.prefix': 'multi-zone/', }, @@ -38,29 +38,29 @@ // Zone-aware replication. // - distributor_args+:: if !($._config.cortex_multi_zone_ingester_enabled && $._config.cortex_multi_zone_ingester_replication_write_path_enabled) then {} else { + distributor_args+:: if !($._config.multi_zone_ingester_enabled && $._config.multi_zone_ingester_replication_write_path_enabled) then {} else { 'ingester.ring.zone-awareness-enabled': 'true', }, ruler_args+:: ( - if !($._config.cortex_multi_zone_ingester_enabled && $._config.cortex_multi_zone_ingester_replication_write_path_enabled) then {} else { + if !($._config.multi_zone_ingester_enabled && $._config.multi_zone_ingester_replication_write_path_enabled) then {} else { 'ingester.ring.zone-awareness-enabled': 'true', } ) + ( // During the migration, if read path switch is enabled we need to apply changes directly to rulers instead of queryBlocksStorageConfig. - if !($._config.cortex_multi_zone_store_gateway_enabled && $._config.cortex_multi_zone_store_gateway_read_path_enabled && $._config.cortex_multi_zone_store_gateway_migration_enabled) then {} else { + if !($._config.multi_zone_store_gateway_enabled && $._config.multi_zone_store_gateway_read_path_enabled && $._config.multi_zone_store_gateway_migration_enabled) then {} else { 'store-gateway.sharding-ring.zone-awareness-enabled': 'true', 'store-gateway.sharding-ring.prefix': 'multi-zone/', } ), querier_args+:: ( - if !($._config.cortex_multi_zone_ingester_enabled && $._config.cortex_multi_zone_ingester_replication_read_path_enabled) then {} else { + if !($._config.multi_zone_ingester_enabled && $._config.multi_zone_ingester_replication_read_path_enabled) then {} else { 'ingester.ring.zone-awareness-enabled': 'true', } ) + ( // During the migration, if read path switch is enabled we need to apply changes directly to queriers instead of queryBlocksStorageConfig. - if !($._config.cortex_multi_zone_store_gateway_enabled && $._config.cortex_multi_zone_store_gateway_read_path_enabled && $._config.cortex_multi_zone_store_gateway_migration_enabled) then {} else { + if !($._config.multi_zone_store_gateway_enabled && $._config.multi_zone_store_gateway_read_path_enabled && $._config.multi_zone_store_gateway_migration_enabled) then {} else { 'store-gateway.sharding-ring.zone-awareness-enabled': 'true', 'store-gateway.sharding-ring.prefix': 'multi-zone/', } @@ -88,12 +88,12 @@ self.newIngesterStatefulSet(name, container, with_anti_affinity=false) + statefulSet.mixin.metadata.withLabels({ 'rollout-group': 'ingester' }) + - statefulSet.mixin.metadata.withAnnotations({ 'rollout-max-unavailable': std.toString($._config.cortex_multi_zone_ingester_max_unavailable) }) + + statefulSet.mixin.metadata.withAnnotations({ 'rollout-max-unavailable': std.toString($._config.multi_zone_ingester_max_unavailable) }) + statefulSet.mixin.spec.template.metadata.withLabels({ name: name, 'rollout-group': 'ingester' }) + statefulSet.mixin.spec.selector.withMatchLabels({ name: name, 'rollout-group': 'ingester' }) + statefulSet.mixin.spec.updateStrategy.withType('OnDelete') + statefulSet.mixin.spec.template.spec.withTerminationGracePeriodSeconds(1200) + - statefulSet.mixin.spec.withReplicas(std.ceil($._config.cortex_multi_zone_ingester_replicas / 3)) + + statefulSet.mixin.spec.withReplicas(std.ceil($._config.multi_zone_ingester_replicas / 3)) + { spec+: // Allow to schedule 2+ ingesters in the same zone on the same node, but do not schedule 2+ ingesters in @@ -117,34 +117,34 @@ $.util.serviceFor(sts, $._config.service_ignored_labels) + service.mixin.spec.withClusterIp('None'), // Headless. - ingester_zone_a_container:: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_zone_a_container:: if !$._config.multi_zone_ingester_enabled then null else self.newIngesterZoneContainer('a', $.ingester_zone_a_args), - ingester_zone_a_statefulset: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_zone_a_statefulset: if !$._config.multi_zone_ingester_enabled then null else self.newIngesterZoneStatefulSet('a', $.ingester_zone_a_container), - ingester_zone_a_service: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_zone_a_service: if !$._config.multi_zone_ingester_enabled then null else $.newIngesterZoneService($.ingester_zone_a_statefulset), - ingester_zone_b_container:: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_zone_b_container:: if !$._config.multi_zone_ingester_enabled then null else self.newIngesterZoneContainer('b', $.ingester_zone_b_args), - ingester_zone_b_statefulset: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_zone_b_statefulset: if !$._config.multi_zone_ingester_enabled then null else self.newIngesterZoneStatefulSet('b', $.ingester_zone_b_container), - ingester_zone_b_service: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_zone_b_service: if !$._config.multi_zone_ingester_enabled then null else $.newIngesterZoneService($.ingester_zone_b_statefulset), - ingester_zone_c_container:: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_zone_c_container:: if !$._config.multi_zone_ingester_enabled then null else self.newIngesterZoneContainer('c', $.ingester_zone_c_args), - ingester_zone_c_statefulset: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_zone_c_statefulset: if !$._config.multi_zone_ingester_enabled then null else self.newIngesterZoneStatefulSet('c', $.ingester_zone_c_container), - ingester_zone_c_service: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_zone_c_service: if !$._config.multi_zone_ingester_enabled then null else $.newIngesterZoneService($.ingester_zone_c_statefulset), - ingester_rollout_pdb: if !$._config.cortex_multi_zone_ingester_enabled then null else + ingester_rollout_pdb: if !$._config.multi_zone_ingester_enabled then null else podDisruptionBudget.new() + podDisruptionBudget.mixin.metadata.withName('ingester-rollout-pdb') + podDisruptionBudget.mixin.metadata.withLabels({ name: 'ingester-rollout-pdb' }) + @@ -157,22 +157,22 @@ ingester_statefulset: // Remove the default "ingester" StatefulSet if multi-zone is enabled and no migration is in progress. - if $._config.cortex_multi_zone_ingester_enabled && !$._config.cortex_multi_zone_ingester_migration_enabled + if $._config.multi_zone_ingester_enabled && !$._config.multi_zone_ingester_migration_enabled then null else super.ingester_statefulset, ingester_service: // Remove the default "ingester" service if multi-zone is enabled and no migration is in progress. - if $._config.cortex_multi_zone_ingester_enabled && !$._config.cortex_multi_zone_ingester_migration_enabled + if $._config.multi_zone_ingester_enabled && !$._config.multi_zone_ingester_migration_enabled then null else super.ingester_service, ingester_pdb: // Keep it if multi-zone is disabled. - if !$._config.cortex_multi_zone_ingester_enabled + if !$._config.multi_zone_ingester_enabled then super.ingester_pdb // We don’t want Kubernetes to terminate any "ingester" StatefulSet's pod while migration is in progress. - else if $._config.cortex_multi_zone_ingester_migration_enabled + else if $._config.multi_zone_ingester_migration_enabled then super.ingester_pdb + podDisruptionBudget.mixin.spec.withMaxUnavailable(0) // Remove it if multi-zone is enabled and no migration is in progress. else null, @@ -199,11 +199,11 @@ self.newStoreGatewayStatefulSet(name, container) + statefulSet.mixin.metadata.withLabels({ 'rollout-group': 'store-gateway' }) + - statefulSet.mixin.metadata.withAnnotations({ 'rollout-max-unavailable': std.toString($._config.cortex_multi_zone_store_gateway_max_unavailable) }) + + statefulSet.mixin.metadata.withAnnotations({ 'rollout-max-unavailable': std.toString($._config.multi_zone_store_gateway_max_unavailable) }) + statefulSet.mixin.spec.template.metadata.withLabels({ name: name, 'rollout-group': 'store-gateway' }) + statefulSet.mixin.spec.selector.withMatchLabels({ name: name, 'rollout-group': 'store-gateway' }) + statefulSet.mixin.spec.updateStrategy.withType('OnDelete') + - statefulSet.mixin.spec.withReplicas(std.ceil($._config.cortex_multi_zone_store_gateway_replicas / 3)), + statefulSet.mixin.spec.withReplicas(std.ceil($._config.multi_zone_store_gateway_replicas / 3)), // Creates a headless service for the per-zone store-gateways StatefulSet. We don't use it // but we need to create it anyway because it's responsible for the network identity of @@ -221,36 +221,36 @@ }, }, - store_gateway_zone_a_container:: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_zone_a_container:: if !$._config.multi_zone_store_gateway_enabled then null else self.newStoreGatewayZoneContainer('a'), - store_gateway_zone_a_statefulset: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_zone_a_statefulset: if !$._config.multi_zone_store_gateway_enabled then null else (self + nonRetainablePVCs).newStoreGatewayZoneStatefulSet('a', $.store_gateway_zone_a_container), - store_gateway_zone_a_service: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_zone_a_service: if !$._config.multi_zone_store_gateway_enabled then null else self.newStoreGatewayZoneService($.store_gateway_zone_a_statefulset), - store_gateway_zone_b_container:: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_zone_b_container:: if !$._config.multi_zone_store_gateway_enabled then null else self.newStoreGatewayZoneContainer('b'), - store_gateway_zone_b_statefulset: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_zone_b_statefulset: if !$._config.multi_zone_store_gateway_enabled then null else (self + nonRetainablePVCs).newStoreGatewayZoneStatefulSet('b', $.store_gateway_zone_b_container), - store_gateway_zone_b_service: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_zone_b_service: if !$._config.multi_zone_store_gateway_enabled then null else self.newStoreGatewayZoneService($.store_gateway_zone_b_statefulset), - store_gateway_zone_c_container:: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_zone_c_container:: if !$._config.multi_zone_store_gateway_enabled then null else self.newStoreGatewayZoneContainer('c'), - store_gateway_zone_c_statefulset: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_zone_c_statefulset: if !$._config.multi_zone_store_gateway_enabled then null else (self + nonRetainablePVCs).newStoreGatewayZoneStatefulSet('c', $.store_gateway_zone_c_container), - store_gateway_zone_c_service: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_zone_c_service: if !$._config.multi_zone_store_gateway_enabled then null else self.newStoreGatewayZoneService($.store_gateway_zone_c_statefulset), // Create a service backed by all store-gateway replicas (in all zone). // This service is used to access the store-gateway admin UI. - store_gateway_multi_zone_service: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_multi_zone_service: if !$._config.multi_zone_store_gateway_enabled then null else local name = 'store-gateway-multi-zone'; local labels = { 'rollout-group': 'store-gateway' }; local ports = [ @@ -261,7 +261,7 @@ service.new(name, labels, ports) + service.mixin.metadata.withLabels({ name: name }), - store_gateway_rollout_pdb: if !$._config.cortex_multi_zone_store_gateway_enabled then null else + store_gateway_rollout_pdb: if !$._config.multi_zone_store_gateway_enabled then null else podDisruptionBudget.new() + podDisruptionBudget.mixin.metadata.withName('store-gateway-rollout-pdb') + podDisruptionBudget.mixin.metadata.withLabels({ name: 'store-gateway-rollout-pdb' }) + @@ -274,19 +274,19 @@ store_gateway_statefulset: // Remove the default store-gateway StatefulSet if multi-zone is enabled and no migration is in progress. - if $._config.cortex_multi_zone_store_gateway_enabled && !$._config.cortex_multi_zone_store_gateway_migration_enabled + if $._config.multi_zone_store_gateway_enabled && !$._config.multi_zone_store_gateway_migration_enabled then null else super.store_gateway_statefulset, store_gateway_service: // Remove the default store-gateway service if multi-zone is enabled and no migration is in progress. - if $._config.cortex_multi_zone_store_gateway_enabled && !$._config.cortex_multi_zone_store_gateway_migration_enabled + if $._config.multi_zone_store_gateway_enabled && !$._config.multi_zone_store_gateway_migration_enabled then null else super.store_gateway_service, store_gateway_pdb: // Remove the default store-gateway PodDisruptionBudget if multi-zone is enabled and no migration is in progress. - if $._config.cortex_multi_zone_store_gateway_enabled && !$._config.cortex_multi_zone_store_gateway_migration_enabled + if $._config.multi_zone_store_gateway_enabled && !$._config.multi_zone_store_gateway_migration_enabled then null else super.store_gateway_pdb, @@ -294,7 +294,7 @@ // Rollout operator. // - local rollout_operator_enabled = $._config.cortex_multi_zone_ingester_enabled || $._config.cortex_multi_zone_store_gateway_enabled, + local rollout_operator_enabled = $._config.multi_zone_ingester_enabled || $._config.multi_zone_store_gateway_enabled, rollout_operator_args:: { 'kubernetes.namespace': $._config.namespace,