Skip to content

Commit a6f8ddd

Browse files
authored
fix: fix ControlPlane status update (#2961)
1 parent f6966d7 commit a6f8ddd

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

controller/controlplane/controller.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,11 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
413413

414414
return r.initStatusToWaitingToBecomeReady(ctx, logger, cp)
415415
}
416+
417+
// Ensure the status reflects the current config even when the hash matches.
418+
// This handles cases where the status was not yet updated (e.g., after an update
419+
// to the spec that changed controllers/feature gates).
420+
r.ensureControlPlaneStatus(cp, mgrCfg)
416421
}
417422

418423
markAsProvisioned(cp)

test/envtest/konnect_entities_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ func testNewKonnectEntityReconciler[
7474
konnect.WithMetricRecorder[T, TEnt](&metricsmocks.MockRecorder{})))
7575

7676
const (
77-
wait = time.Second
78-
tick = 20 * time.Millisecond
77+
wait = 10 * time.Second
78+
tick = 200 * time.Millisecond
7979
)
8080

8181
for _, tc := range testCases {

0 commit comments

Comments
 (0)