Improve consistency

- tweak log and error messages - use versioned APIs - `ClientSet()` each time, as otherwise it breaks testability with current implementation of `*FakeRawClient.ClientSet()`.
eksctl-io · Mar 14, 2019 · 750f6fd · 750f6fd
1 parent 72c4a2d
commit 750f6fd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/pkg/addons/default/aws_node.go b/pkg/addons/default/aws_node.go
@@ -24,13 +24,13 @@ const (
 
 // UpdateAWSNode will update the `aws-node` add-on
 func UpdateAWSNode(rawClient kubernetes.RawClientInterface, region string) error {
-	_, err := rawClient.ClientSet().Apps().DaemonSets(metav1.NamespaceSystem).Get(AWSNode, metav1.GetOptions{})
+	_, err := rawClient.ClientSet().AppsV1().DaemonSets(metav1.NamespaceSystem).Get(AWSNode, metav1.GetOptions{})
 	if err != nil {
 		if apierrs.IsNotFound(err) {
 			logger.Warning("%q was not found", AWSNode)
 			return nil
 		}
-		return errors.Wrapf(err, "getting %s", AWSNode)
+		return errors.Wrapf(err, "getting %q", AWSNode)
 	}
 
 	// if DaemonSets is present, go through our list of assets

diff --git a/pkg/addons/default/coredns.go b/pkg/addons/default/coredns.go
@@ -33,10 +33,7 @@ const (
 
 // InstallCoreDNS will install the `coredns` add-on in place of `kube-dns`
 func InstallCoreDNS(rawClient kubernetes.RawClientInterface, region string, waitTimeout *time.Duration) error {
-	coreClient := rawClient.ClientSet().CoreV1()
-	deploymentsClient := rawClient.ClientSet().AppsV1().Deployments(metav1.NamespaceSystem)
-
-	kubeDNSSevice, err := coreClient.Services(metav1.NamespaceSystem).Get(KubeDNS, metav1.GetOptions{})
+	kubeDNSSevice, err := rawClient.ClientSet().CoreV1().Services(metav1.NamespaceSystem).Get(KubeDNS, metav1.GetOptions{})
 	if err != nil {
 		if apierrs.IsNotFound(err) {
 			logger.Warning("%q service was not found", KubeDNS)
@@ -45,7 +42,7 @@ func InstallCoreDNS(rawClient kubernetes.RawClientInterface, region string, wait
 		return errors.Wrapf(err, "getting %q service", KubeDNS)
 	}
 
-	kubeDNSDeployment, err := deploymentsClient.Get(KubeDNS, metav1.GetOptions{})
+	kubeDNSDeployment, err := rawClient.ClientSet().AppsV1().Deployments(metav1.NamespaceSystem).Get(KubeDNS, metav1.GetOptions{})
 	if err != nil {
 		if apierrs.IsNotFound(err) {
 			logger.Warning("%q deployment was not found", KubeDNS)
@@ -57,7 +54,7 @@ func InstallCoreDNS(rawClient kubernetes.RawClientInterface, region string, wait
 	if v, ok := kubeDNSDeployment.Spec.Selector.MatchLabels[componentLabel]; !ok || v != KubeDNS {
 		logger.Debug("adding %q label to %q", componentLabel, KubeDNS)
 		kubeDNSDeployment.Spec.Selector.MatchLabels[componentLabel] = KubeDNS
-		if _, err := deploymentsClient.Update(kubeDNSDeployment); err != nil {
+		if _, err := rawClient.ClientSet().AppsV1().Deployments(metav1.NamespaceSystem).Update(kubeDNSDeployment); err != nil {
 			return errors.Wrapf(err, "patching %q", KubeDNS)
 		}
 	}
@@ -106,12 +103,12 @@ func InstallCoreDNS(rawClient kubernetes.RawClientInterface, region string, wait
 		timer := time.After(*waitTimeout)
 		timeout := false
 		readyPods := sets.NewString()
-		watcher, err := coreClient.Pods(metav1.NamespaceSystem).Watch(listPodsOptions)
+		watcher, err := rawClient.ClientSet().CoreV1().Pods(metav1.NamespaceSystem).Watch(listPodsOptions)
 		if err != nil {
 			return errors.Wrapf(err, "creating %q pod watcher", CoreDNS)
 		}
 
-		podList, err := coreClient.Pods(metav1.NamespaceSystem).List(listPodsOptions)
+		podList, err := rawClient.ClientSet().CoreV1().Pods(metav1.NamespaceSystem).List(listPodsOptions)
 		if err != nil {
 			return errors.Wrapf(err, "listing %q pods", CoreDNS)
 		}
@@ -147,7 +144,7 @@ func InstallCoreDNS(rawClient kubernetes.RawClientInterface, region string, wait
 		}
 	}
 
-	if err := deploymentsClient.Delete(KubeDNS, &metav1.DeleteOptions{}); err != nil {
+	if err := rawClient.ClientSet().AppsV1().Deployments(metav1.NamespaceSystem).Delete(KubeDNS, &metav1.DeleteOptions{}); err != nil {
 		return errors.Wrapf(err, "deleting %q", KubeDNS)
 	}
 

diff --git a/pkg/addons/default/kube_proxy.go b/pkg/addons/default/kube_proxy.go
@@ -23,13 +23,13 @@ const (
 func UpdateKubeProxyImageTag(clientSet kubernetes.Interface, controlPlaneVersion string, dryRun bool) error {
 	printer := printers.NewJSONPrinter()
 
-	d, err := clientSet.Apps().DaemonSets(metav1.NamespaceSystem).Get(KubeProxy, metav1.GetOptions{})
+	d, err := clientSet.AppsV1().DaemonSets(metav1.NamespaceSystem).Get(KubeProxy, metav1.GetOptions{})
 	if err != nil {
 		if apierrs.IsNotFound(err) {
 			logger.Warning("%q was not found", KubeProxy)
 			return nil
 		}
-		return errors.Wrapf(err, "getting %s", KubeProxy)
+		return errors.Wrapf(err, "getting %q", KubeProxy)
 	}
 	if numContainers := len(d.Spec.Template.Spec.Containers); !(numContainers >= 1) {
 		return fmt.Errorf("%s has %d containers, expected at least 1", KubeProxy, numContainers)
@@ -65,7 +65,7 @@ func UpdateKubeProxyImageTag(clientSet kubernetes.Interface, controlPlaneVersion
 	if err := printer.LogObj(logger.Debug, KubeProxy+" [updated] = \\\n%s\n", d); err != nil {
 		return err
 	}
-	if _, err := clientSet.Apps().DaemonSets(metav1.NamespaceSystem).Update(d); err != nil {
+	if _, err := clientSet.AppsV1().DaemonSets(metav1.NamespaceSystem).Update(d); err != nil {
 		return err
 	}
 

diff --git a/pkg/ctl/utils/update_aws_node.go b/pkg/ctl/utils/update_aws_node.go
@@ -74,5 +74,5 @@ func doUpdateAWSNode(p *api.ProviderConfig, cfg *api.ClusterConfig, nameArg stri
 		return err
 	}
 
-	return defaultaddons.UpdateAWSNode(rawClient, p.Region)
+	return defaultaddons.UpdateAWSNode(rawClient, meta.Region)
 }