Skip to content

[jsonnet/microservices]: configure zone-aware PDB for live-store #6328

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

Merged
zalegrala merged 2 commits into from
Jan 29, 2026
Merged

[jsonnet/microservices]: configure zone-aware PDB for live-store #6328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccbfe1e
[jsonnet/microservices]: configure zone-aware PDB for live-store
zalegrala Jan 28, 2026
d81e968
Compile jsonnet
zalegrala Jan 28, 2026
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
4 changes: 2 additions & 2 deletions operations/jsonnet-compiled/jsonnetfile.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "ksonnet-util"
}
},
"version": "7e85f545f8c3c67073a53679eefb1adf15b39a73",
"version": "517e2f277e18152b2a941133f7aab80ccf73bd1e",
"sum": "0y3AFX9LQSpfWTxWKSwoLgbt0Wc9nnCwhMH2szKzHv0="
},
{
Expand All @@ -18,7 +18,7 @@
"subdir": "memcached"
}
},
"version": "7e85f545f8c3c67073a53679eefb1adf15b39a73",
"version": "517e2f277e18152b2a941133f7aab80ccf73bd1e",
"sum": "zNTCDRaCqJUHjQSQRsxGR3jLrMP9tU7YNQb13dbm1bU="
},
{
Expand Down
12 changes: 0 additions & 12 deletions ...et-compiled/microservices-with-extras/gen/PodDisruptionBudget-live-store-rollout-pdb.yaml
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions ...mpiled/microservices-with-extras/gen/ZoneAwarePodDisruptionBudget-live-store-rollout.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: rollout-operator.grafana.com/v1
kind: ZoneAwarePodDisruptionBudget
metadata:
labels:
name: live-store-rollout
name: live-store-rollout
namespace: tracing
spec:
maxUnavailable: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-([0-9]+)'
podNameRegexGroup: 1
selector:
matchLabels:
rollout-group: live-store
12 changes: 0 additions & 12 deletions ...ations/jsonnet-compiled/microservices/gen/PodDisruptionBudget-live-store-rollout-pdb.yaml
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions ...s/jsonnet-compiled/microservices/gen/ZoneAwarePodDisruptionBudget-live-store-rollout.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: rollout-operator.grafana.com/v1
kind: ZoneAwarePodDisruptionBudget
metadata:
labels:
name: live-store-rollout
name: live-store-rollout
namespace: tracing
spec:
maxUnavailable: 1
podNamePartitionRegex: '[a-z\-]+-zone-[a-z]-([0-9]+)'
podNameRegexGroup: 1
selector:
matchLabels:
rollout-group: live-store
12 changes: 5 additions & 7 deletions operations/jsonnet/microservices/live-store.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
local volumeMount = k.core.v1.volumeMount,
local pvc = k.core.v1.persistentVolumeClaim,

local this = self,

//
// Multi-zone live-stores (non-optional).
//
Expand Down Expand Up @@ -172,11 +174,9 @@
tempo_live_store_zone_b_service:
$.newLiveStoreZoneService($.tempo_live_store_zone_b_statefulset),

live_store_rollout_pdb:
podDisruptionBudget.new('live-store-rollout-pdb') +
podDisruptionBudget.mixin.metadata.withLabels({ name: 'live-store-rollout-pdb' }) +
podDisruptionBudget.mixin.spec.selector.withMatchLabels({ 'rollout-group': 'live-store' }) +
podDisruptionBudget.mixin.spec.withMaxUnavailable(1),
live_store_rollout_pdb: if $._config.live_store.zpdb.enabled then
this.newZPDB('live-store-rollout', 'live-store', $._config.live_store.zpdb.max_unavailable, $._config.live_store.zpdb.partition_regex, $._config.live_store.zpdb.partition_group)
else {},

tempo_live_store_configmap:
configMap.new('tempo-live-store') +
Expand All @@ -192,8 +192,6 @@

tempo_live_store_service: null, // Only multi-zone services are supported

live_store_pdb: null, // Only rollout PDB is used

// Vertical Pod Autoscaler
tempo_live_store_vpa: [
$.vpaForController($.tempo_live_store_zone_a_statefulset, 'live_store'),
Expand Down
16 changes: 10 additions & 6 deletions operations/jsonnet/microservices/pod-disruption-budget.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,16 @@
},
},

// TODO: use the zpdb from the rollout-operator for live_stores
// live_store+: {
// pdb: {
// enabled: false,
// },
// },
live_store+: {
// Live-stores use the zone-aware Pod Disruption Budget.
// https://github.com/grafana/rollout-operator/blob/main/operations/rollout-operator/zone-aware-pod-disruption-budget.libsonnet
zpdb: {
enabled: true, // Required by default.
max_unavailable: 1,
partition_regex: '[a-z\\-]+-zone-[a-z]-([0-9]+)',
partition_group: 1,
},
},

metrics_generator+: {
pdb: {
Expand Down
Loading