Skip to content

Commit

Permalink
Fix formatting, linter errors, and pass context to cluster client
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Lipovetsky <dlipovetsky@d2iq.com>
  • Loading branch information
dlipovetsky committed Feb 7, 2020
1 parent 068d438 commit 3ff0876
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 113 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ type KubeadmControlPlaneReconciler struct {

managementCluster *internal.ManagementCluster

remoteClientGetter remote.ClusterClientGetter
remoteClientGetter remote.ClusterClientGetter
}

func (r *KubeadmControlPlaneReconciler) SetupWithManager(mgr ctrl.Manager, options controller.Options) error {
Expand Down Expand Up @@ -189,7 +189,7 @@ func (r *KubeadmControlPlaneReconciler) reconcile(ctx context.Context, cluster *
// TODO: handle proper adoption of Machines
clusterKey := types.NamespacedName{
Namespace: cluster.GetNamespace(),
Name: cluster.GetName(),
Name: cluster.GetName(),
}
ownedMachines, err := r.managementCluster.GetMachinesForCluster(ctx, clusterKey, internal.OwnedControlPlaneMachines(kcp.Name))
if err != nil {
Expand Down Expand Up @@ -289,7 +289,7 @@ func (r *KubeadmControlPlaneReconciler) updateStatus(ctx context.Context, kcp *c

clusterKey := types.NamespacedName{
Namespace: cluster.Namespace,
Name: cluster.Name,
Name: cluster.Name,
}
ownedMachines, err := r.managementCluster.GetMachinesForCluster(ctx, clusterKey, internal.OwnedControlPlaneMachines(kcp.Name))
if err != nil {
Expand Down Expand Up @@ -519,7 +519,6 @@ func (r *KubeadmControlPlaneReconciler) generateMachine(ctx context.Context, kcp
return nil
}


// reconcileDelete handles KubeadmControlPlane deletion.
// The implementation does not take non-control plane workloads into
// consideration. This may or may not change in the future. Please see
Expand Down
Loading

0 comments on commit 3ff0876

Please sign in to comment.