Skip to content

Commit 8ced727

Browse files
sethp-nrdetiber
andauthored
Apply suggestions from code review
Co-Authored-By: Jason DeTiberus <[email protected]>
1 parent 17da6e3 commit 8ced727

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -952,9 +952,7 @@ func (r *KubeadmControlPlaneReconciler) AdoptMachines(ctx context.Context, kcp *
952952

953953
func (r *KubeadmControlPlaneReconciler) AdoptOwnedSecrets(ctx context.Context, kcp *controlplanev1.KubeadmControlPlane, currentOwner metav1.Object) error {
954954
secrets := corev1.SecretList{}
955-
err := r.Client.List(ctx, &secrets, client.InNamespace(kcp.Namespace))
956-
957-
if err != nil {
955+
if err := r.Client.List(ctx, &secrets, client.InNamespace(kcp.Namespace)); err != nil {
958956
return errors.Wrap(err, "error finding secrets for adoption")
959957
}
960958

@@ -979,8 +977,7 @@ func (r *KubeadmControlPlaneReconciler) AdoptOwnedSecrets(ctx context.Context, k
979977
BlockOwnerDeletion: pointer.BoolPtr(true),
980978
}, currentOwner))
981979

982-
err := r.Client.Update(ctx, &ss)
983-
if err != nil {
980+
if err := r.Client.Update(ctx, &ss); err != nil {
984981
return errors.Wrapf(err, "error changing secret %v ownership from KubeadmConfig/%v to KubeadmControlPlane/%v", s.Name, currentOwner.GetName(), kcp.Name)
985982
}
986983
}

0 commit comments

Comments
 (0)