address comments

kubernetes-sigs · Mar 6, 2020 · a068996 · a068996
1 parent 08a1b02
commit a068996
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go b/controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go
@@ -268,6 +268,7 @@ func (r *KubeadmControlPlaneReconciler) reconcile(ctx context.Context, cluster *
 	err = workloadCluster.UpdateKubeProxyImage(ctx, kcp)
 	if err != nil {
 		logger.Error(err, "failed updating kube-proxy image")
+		return ctrl.Result{}, err
 	}
 
 	numMachines := len(ownedMachines)

diff --git a/controlplane/kubeadm/internal/workload_cluster.go b/controlplane/kubeadm/internal/workload_cluster.go
@@ -48,7 +48,7 @@ var (
 	ErrControlPlaneMinNodes = errors.New("cluster has fewer than 2 control plane nodes; removing an etcd member is not supported")
 )
 
-var (
+const (
 	kubeProxyDaemonSetName = "kube-proxy"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ var ( @@
     	ErrControlPlaneMinNodes = errors.New("cluster has fewer than 2 control plane nodes; removing an etcd member is not supported")
     )
-    var (
+    const (
     	kubeProxyDaemonSetName = "kube-proxy"
     )
@@ Expand Down @@