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

Fix pdb defaulting logic #3200

Merged
merged 6 commits into from
Aug 7, 2024
Merged

Fix pdb defaulting logic #3200

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee65ea0
Fix PDB defaulting logic
jaronoff97 Aug 6, 2024
666bafd
oop
jaronoff97 Aug 6, 2024
15d1080
chlog
jaronoff97 Aug 6, 2024
64a8e2f
fix unit
jaronoff97 Aug 6, 2024
72e8bff
fix tests
jaronoff97 Aug 6, 2024
a11ca79
Update docs
jaronoff97 Aug 7, 2024
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
16 changes: 16 additions & 0 deletions .chloggen/fix-pdb-defaulting-logic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
component: collector

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fixes a bug where the operator would default the PDB in the wrong place.

# One or more tracking issues related to the change
issues: [3198]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
30 changes: 0 additions & 30 deletions apis/v1beta1/collector_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/go-logr/logr"
autoscalingv2 "k8s.io/api/autoscaling/v2"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/validation"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
Expand Down Expand Up @@ -92,35 +91,6 @@ func (c CollectorWebhook) Default(_ context.Context, obj runtime.Object) error {
}
}

// if pdb isn't provided, we set MaxUnavailable 1,
// which will work even if there is just one replica,
// not blocking node drains but preventing out-of-the-box
// from disruption generated by them with replicas > 1
if otelcol.Spec.PodDisruptionBudget == nil {
otelcol.Spec.PodDisruptionBudget = &PodDisruptionBudgetSpec{
MaxUnavailable: &intstr.IntOrString{
Type: intstr.Int,
IntVal: 1,
},
}
}

// if pdb isn't provided for target allocator and it's enabled
// using a valid strategy (consistent-hashing, per-node),
// we set MaxUnavailable 1, which will work even if there is
// just one replica, not blocking node drains but preventing
// out-of-the-box from disruption generated by them with replicas > 1
if otelcol.Spec.TargetAllocator.Enabled &&
otelcol.Spec.TargetAllocator.AllocationStrategy != TargetAllocatorAllocationStrategyLeastWeighted &&
otelcol.Spec.TargetAllocator.PodDisruptionBudget == nil {
otelcol.Spec.TargetAllocator.PodDisruptionBudget = &PodDisruptionBudgetSpec{
MaxUnavailable: &intstr.IntOrString{
Type: intstr.Int,
IntVal: 1,
},
}
}

if otelcol.Spec.Ingress.Type == IngressTypeRoute && otelcol.Spec.Ingress.Route.Termination == "" {
otelcol.Spec.Ingress.Route.Termination = TLSRouteTerminationTypeEdge
}
Expand Down
60 changes: 0 additions & 60 deletions apis/v1beta1/collector_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
ManagementState: ManagementStateManaged,
Replicas: &one,
PodDisruptionBudget: &PodDisruptionBudgetSpec{
MaxUnavailable: &intstr.IntOrString{
Type: intstr.Int,
IntVal: 1,
},
},
},
Mode: ModeDeployment,
UpgradeStrategy: UpgradeStrategyAutomatic,
Expand Down Expand Up @@ -156,12 +150,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
Replicas: &five,
ManagementState: ManagementStateManaged,
PodDisruptionBudget: &PodDisruptionBudgetSpec{
MaxUnavailable: &intstr.IntOrString{
Type: intstr.Int,
IntVal: 1,
},
},
},
},
},
Expand Down Expand Up @@ -191,12 +179,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
Replicas: &five,
ManagementState: ManagementStateUnmanaged,
PodDisruptionBudget: &PodDisruptionBudgetSpec{
MaxUnavailable: &intstr.IntOrString{
Type: intstr.Int,
IntVal: 1,
},
},
},
},
},
Expand Down Expand Up @@ -224,12 +206,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
Replicas: &one,
ManagementState: ManagementStateManaged,
PodDisruptionBudget: &PodDisruptionBudgetSpec{
MaxUnavailable: &intstr.IntOrString{
Type: intstr.Int,
IntVal: 1,
},
},
},
Autoscaler: &AutoscalerSpec{
TargetCPUUtilization: &defaultCPUTarget,
Expand Down Expand Up @@ -261,12 +237,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
ManagementState: ManagementStateManaged,
Replicas: &one,
PodDisruptionBudget: &PodDisruptionBudgetSpec{
MaxUnavailable: &intstr.IntOrString{
Type: intstr.Int,
IntVal: 1,
},
},
},
Ingress: Ingress{
Type: IngressTypeRoute,
Expand Down Expand Up @@ -345,12 +315,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
Replicas: &one,
ManagementState: ManagementStateManaged,
PodDisruptionBudget: &PodDisruptionBudgetSpec{
MaxUnavailable: &intstr.IntOrString{
Type: intstr.Int,
IntVal: 1,
},
},
},
UpgradeStrategy: UpgradeStrategyAutomatic,
TargetAllocator: TargetAllocatorEmbedded{
Expand Down Expand Up @@ -396,12 +360,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
Replicas: &one,
ManagementState: ManagementStateManaged,
PodDisruptionBudget: &PodDisruptionBudgetSpec{
MaxUnavailable: &intstr.IntOrString{
Type: intstr.Int,
IntVal: 1,
},
},
},
UpgradeStrategy: UpgradeStrategyAutomatic,
TargetAllocator: TargetAllocatorEmbedded{
Expand Down Expand Up @@ -442,24 +400,12 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
Replicas: &one,
ManagementState: ManagementStateManaged,
PodDisruptionBudget: &PodDisruptionBudgetSpec{
MaxUnavailable: &intstr.IntOrString{
Type: intstr.Int,
IntVal: 1,
},
},
},
UpgradeStrategy: UpgradeStrategyAutomatic,
TargetAllocator: TargetAllocatorEmbedded{
Enabled: true,
Replicas: &one,
AllocationStrategy: TargetAllocatorAllocationStrategyConsistentHashing,
PodDisruptionBudget: &PodDisruptionBudgetSpec{
MaxUnavailable: &intstr.IntOrString{
Type: intstr.Int,
IntVal: 1,
},
},
},
},
},
Expand Down Expand Up @@ -487,12 +433,6 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
Args: map[string]string{"feature-gates": "-component.UseLocalHostAsDefaultHost"},
Replicas: &one,
ManagementState: ManagementStateManaged,
PodDisruptionBudget: &PodDisruptionBudgetSpec{
MaxUnavailable: &intstr.IntOrString{
Type: intstr.Int,
IntVal: 1,
},
},
},
UpgradeStrategy: UpgradeStrategyAutomatic,
TargetAllocator: TargetAllocatorEmbedded{
Expand Down
Loading
Loading