From 4cb0f7124b9b2fa6e4d3a275f080ece27039bd7c Mon Sep 17 00:00:00 2001 From: Sebastian Florek Date: Mon, 27 Jan 2025 10:15:20 +0100 Subject: [PATCH] fix: bootstrap token status not handled properly --- .../internal/controller/bootstraptoken_controller.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/go/controller/internal/controller/bootstraptoken_controller.go b/go/controller/internal/controller/bootstraptoken_controller.go index 0e500d724a..b695cca2df 100644 --- a/go/controller/internal/controller/bootstraptoken_controller.go +++ b/go/controller/internal/controller/bootstraptoken_controller.go @@ -57,7 +57,9 @@ func (in *BootstrapTokenReconciler) Reconcile(ctx context.Context, req ctrl.Requ if err := in.Get(ctx, req.NamespacedName, bootstrapToken); err != nil { return ctrl.Result{}, client.IgnoreNotFound(err) } + utils.MarkCondition(bootstrapToken.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionFalse, v1alpha1.ReadyConditionReason, "") + utils.MarkCondition(bootstrapToken.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReason, "") scope, err := NewDefaultScope(ctx, in.Client, bootstrapToken) if err != nil { @@ -81,12 +83,11 @@ func (in *BootstrapTokenReconciler) Reconcile(ctx context.Context, req ctrl.Requ // Check if token already exists and return early. if !lo.IsEmpty(bootstrapToken.ConsoleID()) { + utils.MarkCondition(bootstrapToken.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionTrue, v1alpha1.ReadyConditionReason, "") + utils.MarkCondition(bootstrapToken.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionTrue, v1alpha1.SynchronizedConditionReason, "") return ctrl.Result{}, nil } - utils.MarkCondition(bootstrapToken.SetCondition, v1alpha1.ReadyConditionType, v1.ConditionFalse, v1alpha1.ReadyConditionReason, "") - utils.MarkCondition(bootstrapToken.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReason, "") - // Create token and generate secret apiBootstrapToken, err := in.ensure(ctx, bootstrapToken) if err != nil {