Make ekctl utils update-aws-node aware of Kubernetes version

It needs to pick the right manifest based on the version used.
eksctl-io · Apr 16, 2019 · 3315d3d · 3315d3d
1 parent b828036
commit 3315d3d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/pkg/addons/default/aws_node.go b/pkg/addons/default/aws_node.go
@@ -23,7 +23,7 @@ const (
 )
 
 // UpdateAWSNode will update the `aws-node` add-on
-func UpdateAWSNode(rawClient kubernetes.RawClientInterface, region string) error {
+func UpdateAWSNode(rawClient kubernetes.RawClientInterface, region string, controlPlaneVersion string) error {
 	_, err := rawClient.ClientSet().AppsV1().DaemonSets(metav1.NamespaceSystem).Get(AWSNode, metav1.GetOptions{})
 	if err != nil {
 		if apierrs.IsNotFound(err) {
@@ -34,7 +34,11 @@ func UpdateAWSNode(rawClient kubernetes.RawClientInterface, region string) error
 	}
 
 	// if DaemonSets is present, go through our list of assets
-	list, err := LoadAsset(AWSNode, "yaml")
+	assetName := AWSNode
+	if strings.HasPrefix(controlPlaneVersion, "1.10.") {
+		assetName += "-1.10"
+	}
+	list, err := LoadAsset(assetName, "yaml")
 	if err != nil {
 		return err
 	}

diff --git a/pkg/ctl/utils/update_aws_node.go b/pkg/ctl/utils/update_aws_node.go
@@ -70,5 +70,10 @@ func doUpdateAWSNode(p *api.ProviderConfig, cfg *api.ClusterConfig, nameArg stri
 		return err
 	}
 
-	return defaultaddons.UpdateAWSNode(rawClient, meta.Region)
+	kubernetesVersion, err := rawClient.ServerVersion()
+	if err != nil {
+		return err
+	}
+
+	return defaultaddons.UpdateAWSNode(rawClient, meta.Region, kubernetesVersion)
 }