Skip to content

Commit a60874e

Browse files
committed
re-fix: upstream lint error
Signed-off-by: sivchari <[email protected]>
1 parent 25673d5 commit a60874e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,9 @@ func (r *KubeadmConfigReconciler) reconcile(ctx context.Context, scope *Scope, c
302302
Message: "Waiting for Cluster status.infrastructureReady to be true",
303303
})
304304
return ctrl.Result{}, nil
305-
// Reconcile status for machines that already have a secret reference, but our status isn't up to date.
306-
// This case solves the pivoting scenario (or a backup restore) which doesn't preserve the status subresource on objects.
307-
case configOwner.DataSecretName() != nil && (!(config.Status.Initialization != nil && config.Status.Initialization.DataSecretCreated) || config.Status.DataSecretName == nil):
305+
// Reconcile status for machines that already have a secret reference, but our status isn't up to date.
306+
// This case solves the pivoting scenario (or a backup restore) which doesn't preserve the status subresource on objects.
307+
case configOwner.DataSecretName() != nil && (config.Status.Initialization == nil || !config.Status.Initialization.DataSecretCreated || config.Status.DataSecretName == nil):
308308
if config.Status.Initialization == nil {
309309
config.Status.Initialization = &bootstrapv1.KubeadmConfigInitializationStatus{}
310310
}

controlplane/kubeadm/internal/controllers/remediation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
114114
return ctrl.Result{}, nil
115115
}
116116

117-
initialized := false
117+
var initialized bool
118118
if controlPlane.KCP.Status.Initialization != nil && controlPlane.KCP.Status.Initialization.ControlPlaneInitialized {
119119
initialized = true
120120
}

0 commit comments

Comments
 (0)