Update aws-node (eksctl-io#2720)

* Update aws-node * Update tests Co-authored-by: Michael Beaumont <mjboamail@gmail.com>
sayboras · Oct 8, 2020 · 5aaf24b · 5aaf24b
1 parent b55beac
commit 5aaf24b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/integration/tests/update/update_cluster_test.go b/integration/tests/update/update_cluster_test.go
@@ -178,7 +178,7 @@ var _ = Describe("(Integration) Update addons", func() {
 				awsNodeVersion, err := addons.ImageTag(clusterDaemonSet.Spec.Template.Spec.Containers[0].Image)
 				Expect(err).ToNot(HaveOccurred())
 				return awsNodeVersion
-			}, k8sUpdatePollTimeout, k8sUpdatePollInterval).Should(Equal("v1.7.3"))
+			}, k8sUpdatePollTimeout, k8sUpdatePollInterval).Should(Equal("v1.7.5"))
 		})
 
 		It("should upgrade coredns", func() {

diff --git a/pkg/addons/default/assets.go b/pkg/addons/default/assets.go
diff --git a/pkg/addons/default/assets/aws-node.yaml b/pkg/addons/default/assets/aws-node.yaml
@@ -153,7 +153,7 @@
               "fieldPath": "spec.nodeName"
         - "name": "WARM_ENI_TARGET"
           "value": "1"
-        "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.3"
+        "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.5"
         "imagePullPolicy": "Always"
         "livenessProbe":
           "exec":
@@ -196,7 +196,7 @@
       - "env":
         - "name": "DISABLE_TCP_EARLY_DEMUX"
           "value": "false"
-        "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.3"
+        "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.5"
         "imagePullPolicy": "Always"
         "name": "aws-vpc-cni-init"
         "securityContext":

diff --git a/pkg/addons/default/aws_node_test.go b/pkg/addons/default/aws_node_test.go
@@ -54,8 +54,8 @@ var _ = Describe("default addons - aws-node", func() {
 			Expect(err).ToNot(HaveOccurred())
 			Expect(needsUpdate).To(BeTrue())
 		})
-		It("reports that sample with 1.7.3 doesn't need an update", func() {
-			loadSample("testdata/sample-1.16-v1.7.3.json")
+		It("reports that sample with 1.7.5 doesn't need an update", func() {
+			loadSample("testdata/sample-1.16-v1.7.json")
 			rawClient.AssumeObjectsMissing = false
 
 			needsUpdate, err := DoesAWSNodeSupportMultiArch(rawClient, "eu-west-1")
@@ -120,7 +120,7 @@ var _ = Describe("default addons - aws-node", func() {
 			Expect(err).ToNot(HaveOccurred())
 			Expect(awsNode.Spec.Template.Spec.Containers).To(HaveLen(1))
 			Expect(awsNode.Spec.Template.Spec.Containers[0].Image).To(
-				Equal("602401143452.dkr.ecr.eu-west-1.amazonaws.com/amazon-k8s-cni:v1.7.3"),
+				Equal("602401143452.dkr.ecr.eu-west-1.amazonaws.com/amazon-k8s-cni:v1.7.5"),
 			)
 
 			rawClient.ClearUpdated()
@@ -138,7 +138,7 @@ var _ = Describe("default addons - aws-node", func() {
 			Expect(err).ToNot(HaveOccurred())
 			Expect(awsNode.Spec.Template.Spec.Containers).To(HaveLen(1))
 			Expect(awsNode.Spec.Template.Spec.Containers[0].Image).To(
-				Equal("602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:v1.7.3"),
+				Equal("602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:v1.7.5"),
 			)
 		})
 
@@ -154,7 +154,7 @@ var _ = Describe("default addons - aws-node", func() {
 			Expect(err).ToNot(HaveOccurred())
 			Expect(awsNode.Spec.Template.Spec.Containers).To(HaveLen(1))
 			Expect(awsNode.Spec.Template.Spec.Containers[0].Image).To(
-				Equal("961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.7.3"),
+				Equal("961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.7.5"),
 			)
 		})
 

diff --git a/.../default/testdata/sample-1.16-v1.7.3.json → ...ns/default/testdata/sample-1.16-v1.7.json b/.../default/testdata/sample-1.16-v1.7.3.json → ...ns/default/testdata/sample-1.16-v1.7.json
@@ -607,7 +607,7 @@
                     }
                   }
                 ],
-                "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.3",
+                "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.7.5",
                 "imagePullPolicy": "Always",
                 "livenessProbe": {
                   "exec": {