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

Zone aware ingesters #7923

Merged
merged 8 commits into from
Jan 30, 2023
Merged

Zone aware ingesters #7923

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d433d7d
zone aware ingesters
manohar-koukuntla Dec 5, 2022
fa393e0
update change log
manohar-koukuntla Dec 13, 2022
9a917a4
remove prof files
manohar-koukuntla Jan 19, 2023
635d327
remove prof files
manohar-koukuntla Jan 19, 2023
c7a04d1
jsonnet fmt
manohar-koukuntla Jan 19, 2023
9e05317
replace null with {}
manohar-koukuntla Jan 19, 2023
10d43a0
replace null with {}
manohar-koukuntla Jan 19, 2023
37f7335
Merge branch 'grafana:main' into zone_aware_ingesters
manohar-koukuntla Jan 19, 2023
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
Prev Previous commit
Next Next commit
replace null with {}
  • Loading branch information
@manohar-koukuntla
manohar-koukuntla committed Jan 19, 2023
commit 9e05317e92eb5f56e9f515f694c38c3abafca4a4
34 changes: 17 additions & 17 deletions production/ksonnet/loki/multi-zone.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,34 +79,34 @@
$.util.serviceFor(sts, $._config.service_ignored_labels) +
service.mixin.spec.withClusterIp('None'), // Headless.

ingester_zone_a_container:: if !$._config.multi_zone_ingester_enabled then null else
ingester_zone_a_container:: if !$._config.multi_zone_ingester_enabled then {} else
self.newIngesterZoneContainer('a', $.ingester_zone_a_args),

ingester_zone_a_statefulset: if !$._config.multi_zone_ingester_enabled then null else
ingester_zone_a_statefulset: if !$._config.multi_zone_ingester_enabled then {} else
self.newIngesterZoneStatefulSet('a', $.ingester_zone_a_container),

ingester_zone_a_service: if !$._config.multi_zone_ingester_enabled then null else
ingester_zone_a_service: if !$._config.multi_zone_ingester_enabled then {} else
$.newIngesterZoneService($.ingester_zone_a_statefulset),

ingester_zone_b_container:: if !$._config.multi_zone_ingester_enabled then null else
ingester_zone_b_container:: if !$._config.multi_zone_ingester_enabled then {} else
self.newIngesterZoneContainer('b', $.ingester_zone_b_args),

ingester_zone_b_statefulset: if !$._config.multi_zone_ingester_enabled then null else
ingester_zone_b_statefulset: if !$._config.multi_zone_ingester_enabled then {} else
self.newIngesterZoneStatefulSet('b', $.ingester_zone_b_container),

ingester_zone_b_service: if !$._config.multi_zone_ingester_enabled then null else
ingester_zone_b_service: if !$._config.multi_zone_ingester_enabled then {} else
$.newIngesterZoneService($.ingester_zone_b_statefulset),

ingester_zone_c_container:: if !$._config.multi_zone_ingester_enabled then null else
ingester_zone_c_container:: if !$._config.multi_zone_ingester_enabled then {} else
self.newIngesterZoneContainer('c', $.ingester_zone_c_args),

ingester_zone_c_statefulset: if !$._config.multi_zone_ingester_enabled then null else
ingester_zone_c_statefulset: if !$._config.multi_zone_ingester_enabled then {} else
self.newIngesterZoneStatefulSet('c', $.ingester_zone_c_container),

ingester_zone_c_service: if !$._config.multi_zone_ingester_enabled then null else
ingester_zone_c_service: if !$._config.multi_zone_ingester_enabled then {} else
$.newIngesterZoneService($.ingester_zone_c_statefulset),

ingester_rollout_pdb: if !$._config.multi_zone_ingester_enabled then null else
ingester_rollout_pdb: if !$._config.multi_zone_ingester_enabled then {} else
podDisruptionBudget.new('ingester-rollout-pdb') +
podDisruptionBudget.mixin.metadata.withLabels({ name: 'ingester-rollout-pdb' }) +
podDisruptionBudget.mixin.spec.selector.withMatchLabels({ 'rollout-group': 'ingester' }) +
Expand All @@ -119,13 +119,13 @@
ingester_statefulset:
// Remove the default "ingester" StatefulSet if multi-zone is enabled and no migration is in progress.
if $._config.multi_zone_ingester_enabled && !$._config.multi_zone_ingester_migration_enabled
then null
then {}
else super.ingester_statefulset,

ingester_service:
// Remove the default "ingester" service if multi-zone is enabled and no migration is in progress.
if $._config.multi_zone_ingester_enabled && !$._config.multi_zone_ingester_migration_enabled
then null
then {}
else super.ingester_service,

ingester_pdb:
Expand All @@ -136,7 +136,7 @@
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,
else {},

//
// Rollout operator.
Expand All @@ -161,15 +161,15 @@
container.mixin.readinessProbe.withInitialDelaySeconds(5) +
container.mixin.readinessProbe.withTimeoutSeconds(1),

rollout_operator_deployment: if !rollout_operator_enabled then null else
rollout_operator_deployment: if !rollout_operator_enabled then {} else
deployment.new('rollout-operator', 1, [$.rollout_operator_container]) +
deployment.mixin.metadata.withName('rollout-operator') +
deployment.mixin.spec.template.spec.withServiceAccountName('rollout-operator') +
// Ensure Kubernetes doesn't run 2 operators at the same time.
deployment.mixin.spec.strategy.rollingUpdate.withMaxSurge(0) +
deployment.mixin.spec.strategy.rollingUpdate.withMaxUnavailable(1),

rollout_operator_role: if !rollout_operator_enabled then null else
rollout_operator_role: if !rollout_operator_enabled then {} else
role.new('rollout-operator-role') +
role.mixin.metadata.withNamespace($._config.namespace) +
role.withRulesMixin([
Expand All @@ -184,7 +184,7 @@
policyRule.withVerbs(['update']),
]),

rollout_operator_rolebinding: if !rollout_operator_enabled then null else
rollout_operator_rolebinding: if !rollout_operator_enabled then {} else
roleBinding.new('rollout-operator-rolebinding') +
roleBinding.mixin.metadata.withNamespace($._config.namespace) +
roleBinding.mixin.roleRef.withApiGroup('rbac.authorization.k8s.io') +
Expand All @@ -196,6 +196,6 @@
namespace: $._config.namespace,
}),

rollout_operator_service_account: if !rollout_operator_enabled then null else
rollout_operator_service_account: if !rollout_operator_enabled then {} else
serviceAccount.new('rollout-operator'),
}