Skip to content

ingester/distributor: Ensure PDB is set to maxUnavailable of 1 #505

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

Open
saswatamcode wants to merge 1 commit into
base: release-6.5
Choose a base branch
from
Open

ingester/distributor: Ensure PDB is set to maxUnavailable of 1 #505

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
4 changes: 2 additions & 2 deletions operator/internal/manifests/distributor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func configureDistributorGRPCServicePKI(deployment *appsv1.Deployment, opts Opti
// Distributor pods.
func newDistributorPodDisruptionBudget(opts Options) *policyv1.PodDisruptionBudget {
l := ComponentLabels(LabelDistributorComponent, opts.Name)
mu := intstr.FromInt(1)
maxUnavailable := intstr.FromInt32(1)
return &policyv1.PodDisruptionBudget{
TypeMeta: metav1.TypeMeta{
Kind: "PodDisruptionBudget",
Expand All @@ -251,7 +251,7 @@ func newDistributorPodDisruptionBudget(opts Options) *policyv1.PodDisruptionBudg
Selector: &metav1.LabelSelector{
MatchLabels: l,
},
MinAvailable: &mu,
MaxUnavailable: &maxUnavailable,
},
}
}
14 changes: 2 additions & 12 deletions operator/internal/manifests/ingester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,17 +290,7 @@ func configureIngesterGRPCServicePKI(sts *appsv1.StatefulSet, opts Options) erro
// Ingester pods.
func newIngesterPodDisruptionBudget(opts Options) *policyv1.PodDisruptionBudget {
l := ComponentLabels(LabelIngesterComponent, opts.Name)
rf := DefaultLokiStackSpec(opts.Stack.Size).Replication.Factor
if opts.Stack.Replication != nil && opts.Stack.Replication.Factor != 0 {
rf = opts.Stack.Replication.Factor
}

pdbMinAvailable := rf
if pdbMinAvailable >= opts.Stack.Template.Ingester.Replicas {
pdbMinAvailable = max(1, opts.Stack.Template.Ingester.Replicas-1)
}
minAvailable := intstr.FromInt32(pdbMinAvailable)

maxUnavailable := intstr.FromInt32(1)
return &policyv1.PodDisruptionBudget{
TypeMeta: metav1.TypeMeta{
Kind: "PodDisruptionBudget",
Expand All @@ -315,7 +305,7 @@ func newIngesterPodDisruptionBudget(opts Options) *policyv1.PodDisruptionBudget
Selector: &metav1.LabelSelector{
MatchLabels: l,
},
MinAvailable: &minAvailable,
MaxUnavailable: &maxUnavailable,
},
}
}