Skip to content

fix: fix flaky enveloped e2e #455

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
britaniar merged 1 commit into from
Feb 23, 2026
Merged

fix: fix flaky enveloped e2e #455

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
8 changes: 7 additions & 1 deletion pkg/controllers/workgenerator/envelope.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ func (r *Reconciler) createOrUpdateEnvelopeCRWorkObj(
fleetv1beta1.PlacementTrackingLabel: binding.GetLabels()[fleetv1beta1.PlacementTrackingLabel],
fleetv1beta1.EnvelopeTypeLabel: envelopeReader.GetEnvelopeType(),
fleetv1beta1.EnvelopeNameLabel: envelopeReader.GetName(),
fleetv1beta1.EnvelopeNamespaceLabel: envelopeReader.GetNamespace(),
}
// Add ParentNamespaceLabel if the binding is namespaced
if binding.GetNamespace() != "" {
labelMatcher[fleetv1beta1.EnvelopeNamespaceLabel] = envelopeReader.GetNamespace()
labelMatcher[fleetv1beta1.ParentNamespaceLabel] = binding.GetNamespace()
}
workList := &fleetv1beta1.WorkList{}
Expand All @@ -87,6 +87,12 @@ func (r *Reconciler) createOrUpdateEnvelopeCRWorkObj(
"resourceBinding", klog.KObj(binding),
"resourceSnapshot", klog.KObj(resourceSnapshot),
"envelope", envelopeReader.GetEnvelopeObjRef())
// Log the work object names to help debug.
workNames := make([]string, len(workList.Items))
for i := range workList.Items {
workNames[i] = workList.Items[i].Name
}
klog.ErrorS(wrappedErr, "Duplicate work objects found", "works", workNames)
return nil, controller.NewUnexpectedBehaviorError(wrappedErr)
case len(workList.Items) == 1:
klog.V(2).InfoS("Found existing work object for the envelope; updating it",
Expand Down
12 changes: 12 additions & 0 deletions pkg/controllers/workgenerator/envelope_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,18 @@ func TestCreateOrUpdateEnvelopeCRWorkObj(t *testing.T) {
want: nil,
wantErr: true,
},
{
name: "two existing works should result in error",
envelopeReader: resourceEnvelope,
resourceOverrideSnapshotHash: "new-resource-hash",
clusterResourceOverrideSnapshotHash: "new-cluster-resource-hash",
existingObjects: func() []client.Object {
existingWork1 := existingWork.DeepCopy()
existingWork1.Name = "test-work-1"
return []client.Object{existingWork, existingWork1}
}(),
wantErr: true,
},
}

for _, tt := range tests {
Expand Down
Loading