Skip to content

[#435] fix: webhook taint conflict check incorrectly rejects dry-run rules #436

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
tejassinghbhati wants to merge 1 commit into
base: main
Choose a base branch
from
+104 −0
Open

[#435] fix: webhook taint conflict check incorrectly rejects dry-run rules #436

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
6 changes: 6 additions & 0 deletions internal/webhook/nodereadinessgaterule_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ func (w *NodeReadinessRuleWebhook) validateTaintConflicts(ctx context.Context, r
continue
}

// Dry-run rules never write taints, so they cannot produce a real
// conflict regardless of taint key or selector overlap.
if rule.Spec.DryRun || existingRule.Spec.DryRun {
continue
}

// Check for same taint key and effect
if existingRule.Spec.Taint.Key == rule.Spec.Taint.Key &&
existingRule.Spec.Taint.Effect == rule.Spec.Taint.Effect {
Expand Down
98 changes: 98 additions & 0 deletions internal/webhook/nodereadinessgaterule_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,5 +791,103 @@ var _ = Describe("NodeReadinessRule Validation Webhook", func() {
Expect(allErrs[0].Field).To(Equal("spec.nodeSelector"))

})

It("should allow a dry-run rule with the same taint key as an enforcement rule on overlapping nodes", func() {
// Seed an enforcement rule that already manages readiness.k8s.io/existing-key.
enforcementRule := &readinessv1alpha1.NodeReadinessRule{
ObjectMeta: metav1.ObjectMeta{Name: "enforcement-existing"},
Spec: readinessv1alpha1.NodeReadinessRuleSpec{
Conditions: []readinessv1alpha1.ConditionRequirement{
{Type: "Ready", RequiredStatus: corev1.ConditionTrue},
},
NodeSelector: metav1.LabelSelector{
MatchLabels: map[string]string{"node-role.kubernetes.io/worker": ""},
},
Taint: corev1.Taint{
Key: "readiness.k8s.io/existing-key",
Effect: corev1.TaintEffectNoSchedule,
},
EnforcementMode: readinessv1alpha1.EnforcementModeContinuous,
},
}

fakeClient := fake.NewClientBuilder().
WithScheme(scheme).
WithObjects(enforcementRule).
Build()
webhook = NewNodeReadinessRuleWebhook(fakeClient)

// A dry-run rule with the same taint key and overlapping selector must
// not be rejected: dry-run rules never write taints, so no real conflict exists.
dryRunRule := &readinessv1alpha1.NodeReadinessRule{
ObjectMeta: metav1.ObjectMeta{Name: "dryrun-preview"},
Spec: readinessv1alpha1.NodeReadinessRuleSpec{
Conditions: []readinessv1alpha1.ConditionRequirement{
{Type: "DiskPressure", RequiredStatus: corev1.ConditionFalse},
},
NodeSelector: metav1.LabelSelector{
MatchLabels: map[string]string{"node-role.kubernetes.io/worker": ""},
},
Taint: corev1.Taint{
Key: "readiness.k8s.io/existing-key",
Effect: corev1.TaintEffectNoSchedule,
},
EnforcementMode: readinessv1alpha1.EnforcementModeContinuous,
DryRun: true,
},
}

allErrs := webhook.validateNodeReadinessRule(ctx, dryRunRule, false)
Expect(allErrs).To(BeEmpty(), "dry-run rules must not be rejected for taint key conflicts")
})

It("should allow an enforcement rule when an overlapping dry-run rule already holds the same taint key", func() {
// Seed a dry-run rule with readiness.k8s.io/preview-key.
dryRunExisting := &readinessv1alpha1.NodeReadinessRule{
ObjectMeta: metav1.ObjectMeta{Name: "dryrun-existing"},
Spec: readinessv1alpha1.NodeReadinessRuleSpec{
Conditions: []readinessv1alpha1.ConditionRequirement{
{Type: "Ready", RequiredStatus: corev1.ConditionTrue},
},
NodeSelector: metav1.LabelSelector{
MatchLabels: map[string]string{"node-role.kubernetes.io/worker": ""},
},
Taint: corev1.Taint{
Key: "readiness.k8s.io/preview-key",
Effect: corev1.TaintEffectNoSchedule,
},
EnforcementMode: readinessv1alpha1.EnforcementModeContinuous,
DryRun: true,
},
}

fakeClient := fake.NewClientBuilder().
WithScheme(scheme).
WithObjects(dryRunExisting).
Build()
webhook = NewNodeReadinessRuleWebhook(fakeClient)

// Creating a real enforcement rule for the same taint key must succeed:
// the existing dry-run rule does not write taints, so there is no conflict.
enforcementRule := &readinessv1alpha1.NodeReadinessRule{
ObjectMeta: metav1.ObjectMeta{Name: "enforcement-new"},
Spec: readinessv1alpha1.NodeReadinessRuleSpec{
Conditions: []readinessv1alpha1.ConditionRequirement{
{Type: "Ready", RequiredStatus: corev1.ConditionTrue},
},
NodeSelector: metav1.LabelSelector{
MatchLabels: map[string]string{"node-role.kubernetes.io/worker": ""},
},
Taint: corev1.Taint{
Key: "readiness.k8s.io/preview-key",
Effect: corev1.TaintEffectNoSchedule,
},
EnforcementMode: readinessv1alpha1.EnforcementModeContinuous,
},
}

allErrs := webhook.validateNodeReadinessRule(ctx, enforcementRule, false)
Expect(allErrs).To(BeEmpty(), "existing dry-run rules must not block creation of enforcement rules")
})
})
})