Apply suggestions from code review

Co-Authored-By: Jason DeTiberus <detiberusj@vmware.com>
kubernetes-sigs · Mar 9, 2020 · 8ced727 · 8ced727
1 parent 17da6e3
commit 8ced727
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go b/controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go
@@ -952,9 +952,7 @@ func (r *KubeadmControlPlaneReconciler) AdoptMachines(ctx context.Context, kcp *
 
 func (r *KubeadmControlPlaneReconciler) AdoptOwnedSecrets(ctx context.Context, kcp *controlplanev1.KubeadmControlPlane, currentOwner metav1.Object) error {
 	secrets := corev1.SecretList{}
-	err := r.Client.List(ctx, &secrets, client.InNamespace(kcp.Namespace))
-
-	if err != nil {
+	if err := r.Client.List(ctx, &secrets, client.InNamespace(kcp.Namespace)); err != nil {
 		return errors.Wrap(err, "error finding secrets for adoption")
 	}
 
@@ -979,8 +977,7 @@ func (r *KubeadmControlPlaneReconciler) AdoptOwnedSecrets(ctx context.Context, k
 			BlockOwnerDeletion: pointer.BoolPtr(true),
 		}, currentOwner))
 
-		err := r.Client.Update(ctx, &ss)
-		if err != nil {
+		if err := r.Client.Update(ctx, &ss); err != nil {
 			return errors.Wrapf(err, "error changing secret %v ownership from KubeadmConfig/%v to KubeadmControlPlane/%v", s.Name, currentOwner.GetName(), kcp.Name)
 		}
 	}