Skip to content

Fix NSG Reconciler Flake #4572

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
mociarain merged 3 commits into from
Feb 6, 2026
+6 −3
Merged

Fix NSG Reconciler Flake #4572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a61b2b
Handle JSON marshal error
mociarain Feb 2, 2026
53de7a5
Update test/e2e/operator.go
mociarain Feb 2, 2026
ec54822
Remove user specification for testing
mociarain Feb 3, 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
5 changes: 4 additions & 1 deletion pkg/operator/controllers/subnets/subnet_nsg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@ func (r *reconcileManager) updateReconcileSubnetAnnotation(ctx context.Context)
Annotations: cluster.Annotations,
},
}
payloadBytes, _ := json.Marshal(patchPayload)
payloadBytes, err := json.Marshal(patchPayload)
if err != nil {
return err
}
return r.client.Patch(ctx, cluster, client.RawPatch(types.MergePatchType, payloadBytes))
})
}
4 changes: 2 additions & 2 deletions test/e2e/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,8 @@ var _ = Describe("ARO Operator - Azure Subnet Reconciler", func() {
By("checking that the cluster document annotations have been patched")
Eventually(func(g Gomega, ctx context.Context) {
co, err := clients.AROClusters.AroV1alpha1().Clusters().Get(ctx, "cluster", metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred())
Expect(co.Annotations).To(Satisfy(subnetReconciliationAnnotationExists))
g.Expect(err).NotTo(HaveOccurred())
g.Expect(co.Annotations).To(Satisfy(subnetReconciliationAnnotationExists))
// Using 2 seconds because the cluster doc should be patched very quickly after the subnet itself is patched.
// The small eventually avoids any unfortunate timing
}).WithContext(ctx).WithTimeout(time.Second * 2).Should(Succeed())
Expand Down
Loading