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

Jsonnet: replace multi_zone_distributor_availability_zones with multi_zone_availability_zones #9736

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Jsonnet: replace multi_zone_distributor_availability_zones with multi_zone_availability_zones #9736

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
2 changes: 1 addition & 1 deletion operations/mimir-tests/test-multi-zone-distributor.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
_config+:: {
local availabilityZones = ['us-east-2a', 'us-east-2b'],
multi_zone_distributor_enabled: true,
multi_zone_distributor_availability_zones: availabilityZones,
multi_zone_availability_zones: availabilityZones,

autoscaling_distributor_enabled: true,
autoscaling_distributor_min_replicas: 3,
Expand Down
6 changes: 3 additions & 3 deletions operations/mimir/autoscaling.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,9 +639,9 @@
local isDistributorMultiZoneEnabled = $._config.multi_zone_distributor_enabled,
local isDistributorAutoscalingEnabled = $._config.autoscaling_distributor_enabled,
local isDistributorAutoscalingSingleZoneEnabled = !isDistributorMultiZoneEnabled && isDistributorAutoscalingEnabled,
local isDistributorAutoscalingZoneAEnabled = isDistributorMultiZoneEnabled && isDistributorAutoscalingEnabled && std.length($._config.multi_zone_distributor_availability_zones) >= 1,
local isDistributorAutoscalingZoneBEnabled = isDistributorMultiZoneEnabled && isDistributorAutoscalingEnabled && std.length($._config.multi_zone_distributor_availability_zones) >= 2,
local isDistributorAutoscalingZoneCEnabled = isDistributorMultiZoneEnabled && isDistributorAutoscalingEnabled && std.length($._config.multi_zone_distributor_availability_zones) >= 3,
local isDistributorAutoscalingZoneAEnabled = isDistributorMultiZoneEnabled && isDistributorAutoscalingEnabled && std.length($._config.multi_zone_availability_zones) >= 1,
local isDistributorAutoscalingZoneBEnabled = isDistributorMultiZoneEnabled && isDistributorAutoscalingEnabled && std.length($._config.multi_zone_availability_zones) >= 2,
local isDistributorAutoscalingZoneCEnabled = isDistributorMultiZoneEnabled && isDistributorAutoscalingEnabled && std.length($._config.multi_zone_availability_zones) >= 3,

distributor_scaled_object: if !isDistributorAutoscalingSingleZoneEnabled then null else
$.newDistributorScaledObject('distributor'),
Expand Down
18 changes: 9 additions & 9 deletions operations/mimir/multi-zone-distributor.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
_config+:: {
multi_zone_availability_zones: [],
multi_zone_distributor_enabled: false,
multi_zone_distributor_availability_zones: [],
multi_zone_distributor_replicas: std.length($._config.multi_zone_distributor_availability_zones),
multi_zone_distributor_replicas: std.length($._config.multi_zone_availability_zones),
},

local container = $.core.v1.container,
local deployment = $.apps.v1.deployment,
local service = $.core.v1.service,

local isMultiZoneEnabled = $._config.multi_zone_distributor_enabled,
local isZoneAEnabled = isMultiZoneEnabled && std.length($._config.multi_zone_distributor_availability_zones) >= 1,
local isZoneBEnabled = isMultiZoneEnabled && std.length($._config.multi_zone_distributor_availability_zones) >= 2,
local isZoneCEnabled = isMultiZoneEnabled && std.length($._config.multi_zone_distributor_availability_zones) >= 3,
local isZoneAEnabled = isMultiZoneEnabled && std.length($._config.multi_zone_availability_zones) >= 1,
local isZoneBEnabled = isMultiZoneEnabled && std.length($._config.multi_zone_availability_zones) >= 2,
local isZoneCEnabled = isMultiZoneEnabled && std.length($._config.multi_zone_availability_zones) >= 3,

distributor_zone_a_args:: $.distributor_args,
distributor_zone_b_args:: $.distributor_args,
Expand All @@ -22,9 +22,9 @@
distributor_zone_b_env_map:: {},
distributor_zone_c_env_map:: {},

distributor_zone_a_node_affinity_matchers:: $.distributor_node_affinity_matchers + [$.newMimirNodeAffinityMatcherAZ($._config.multi_zone_distributor_availability_zones[0])],
distributor_zone_b_node_affinity_matchers:: $.distributor_node_affinity_matchers + [$.newMimirNodeAffinityMatcherAZ($._config.multi_zone_distributor_availability_zones[1])],
distributor_zone_c_node_affinity_matchers:: $.distributor_node_affinity_matchers + [$.newMimirNodeAffinityMatcherAZ($._config.multi_zone_distributor_availability_zones[2])],
distributor_zone_a_node_affinity_matchers:: $.distributor_node_affinity_matchers + [$.newMimirNodeAffinityMatcherAZ($._config.multi_zone_availability_zones[0])],
distributor_zone_b_node_affinity_matchers:: $.distributor_node_affinity_matchers + [$.newMimirNodeAffinityMatcherAZ($._config.multi_zone_availability_zones[1])],
distributor_zone_c_node_affinity_matchers:: $.distributor_node_affinity_matchers + [$.newMimirNodeAffinityMatcherAZ($._config.multi_zone_availability_zones[2])],

distributor_zone_a_container:: if !isZoneAEnabled then null else
$.newDistributorZoneContainer('a', $.distributor_zone_a_args, $.distributor_zone_a_env_map),
Expand Down Expand Up @@ -74,7 +74,7 @@
local name = 'distributor-zone-%s' % zone;

$.newDistributorDeployment(name, container, nodeAffinityMatchers) +
deployment.mixin.spec.withReplicas(std.ceil($._config.multi_zone_distributor_replicas / std.length($._config.multi_zone_distributor_availability_zones))) +
deployment.mixin.spec.withReplicas(std.ceil($._config.multi_zone_distributor_replicas / std.length($._config.multi_zone_availability_zones))) +
deployment.spec.template.spec.withTolerationsMixin([
$.core.v1.toleration.withKey('topology') +
$.core.v1.toleration.withOperator('Equal') +
Expand Down
Loading