Merge branch 'main' into mng-node-repair

Author: sapphirew

.mockery.yaml

@@ -24,13 +24,6 @@ packages:
           dir: "./pkg/eks/mocksv2"
           outpkg: mocksv2
 
-  github.com/aws/aws-sdk-go/aws/client:
-    interfaces:
-      ConfigProvider:
-        config:
-          dir: "./pkg/eks/mocks"
-          outpkg: mocks
-
   github.com/weaveworks/eksctl/pkg/ctl/utils:
     interfaces:
       VPCConfigUpdater:

examples/45-upgrade-policy-example.yaml

@@ -0,0 +1,19 @@
+# A sample ClusterConfig file that creates a cluster with support type set as "EXTENDED (default)".
+
+# UpgradePolicy allows you to specify the support type for your cluster
+# Valid values are "STANDARD" and "EXTENDED (default)"
+# - https://docs.aws.amazon.com/eks/latest/APIReference/API_UpgradePolicyRequest.html
+
+apiVersion: eksctl.io/v1alpha5
+kind: ClusterConfig
+
+metadata:
+  name: upgrade-policy-cluster
+  region: us-west-2
+
+upgradePolicy:
+  supportType: "EXTENDED"
+
+managedNodeGroups:
+  - name: mng-1
+    desiredCapacity: 1

go.mod

@@ -7,7 +7,6 @@ go 1.25.1
 require (
 	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/aws/amazon-ec2-instance-selector/v3 v3.1.2
-	github.com/aws/aws-sdk-go v1.55.8
 	github.com/aws/aws-sdk-go-v2 v1.39.2
 	github.com/aws/aws-sdk-go-v2/config v1.31.12
 	github.com/aws/aws-sdk-go-v2/credentials v1.18.16
@@ -260,7 +259,6 @@ require (
 	github.com/jingyugao/rowserrcheck v1.1.1 // indirect
 	github.com/jinzhu/copier v0.4.0 // indirect
 	github.com/jjti/go-spancheck v0.6.4 // indirect
-	github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
 	github.com/jmoiron/sqlx v1.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect

go.sum

@@ -96,8 +96,6 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/aws/amazon-ec2-instance-selector/v3 v3.1.2 h1:F8GBspJo+RmR4rYyw75XywEEQHQxBbF7QYKaMMnYREc=
 github.com/aws/amazon-ec2-instance-selector/v3 v3.1.2/go.mod h1:wdlMRtz9G4IO6H1yZPsqfGBxR8E6B/bdxHlGkls4kGQ=
-github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ=
-github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk=
 github.com/aws/aws-sdk-go-v2 v1.39.2 h1:EJLg8IdbzgeD7xgvZ+I8M1e0fL0ptn/M47lianzth0I=
 github.com/aws/aws-sdk-go-v2 v1.39.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E=
@@ -551,10 +549,6 @@ github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
 github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/jjti/go-spancheck v0.6.4 h1:Tl7gQpYf4/TMU7AT84MN83/6PutY21Nb9fuQjFTpRRc=
 github.com/jjti/go-spancheck v0.6.4/go.mod h1:yAEYdKJ2lRkDA8g7X+oKUHXOWVAXSBJRv04OhF+QUjk=
-github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 h1:liMMTbpW34dhU4az1GN0pTPADwNmvoRSeoZ6PItiqnY=
-github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -1406,7 +1400,6 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

integration/data/test-dns.yaml

@@ -13,7 +13,7 @@ spec:
       nodeSelector:
         used-for: test-pods
       containers:
-      - image: tutum/dnsutils@sha256:d2244ad47219529f1003bd1513f5c99e71655353a3a63624ea9cb19f8393d5fe
+      - image: public.ecr.aws/docker/library/busybox:1.36.1
         name: dns-test-cluster
         stdin: true
         tty: true
@@ -26,7 +26,7 @@ spec:
             command:
             - nslookup
             - kubernetes.default.svc.cluster.local.
-      - image: tutum/dnsutils@sha256:d2244ad47219529f1003bd1513f5c99e71655353a3a63624ea9cb19f8393d5fe
+      - image: public.ecr.aws/docker/library/busybox:1.36.1
         name: dns-test-eksctl
         stdin: true
         tty: true
@@ -39,7 +39,7 @@ spec:
             command:
             - nslookup
             - eksctl.io
-      - image: tutum/dnsutils@sha256:d2244ad47219529f1003bd1513f5c99e71655353a3a63624ea9cb19f8393d5fe
+      - image: public.ecr.aws/docker/library/busybox:1.36.1
         name: dns-test-k8s
         stdin: true
         tty: true
@@ -52,7 +52,7 @@ spec:
             command:
             - nslookup
             - k8s.io
-      - image: tutum/dnsutils@sha256:d2244ad47219529f1003bd1513f5c99e71655353a3a63624ea9cb19f8393d5fe
+      - image: public.ecr.aws/docker/library/busybox:1.36.1
         name: dns-test-kubernetes
         stdin: true
         tty: true
@@ -65,7 +65,7 @@ spec:
             command:
             - nslookup
             - kubernetes.io
-      - image: tutum/dnsutils@sha256:d2244ad47219529f1003bd1513f5c99e71655353a3a63624ea9cb19f8393d5fe
+      - image: public.ecr.aws/docker/library/busybox:1.36.1
         name: dns-test-eks-us
         stdin: true
         tty: true
@@ -78,7 +78,7 @@ spec:
             command:
             - nslookup
             - EKS.us-east-1.amazonaws.com
-      - image: tutum/dnsutils@sha256:d2244ad47219529f1003bd1513f5c99e71655353a3a63624ea9cb19f8393d5fe
+      - image: public.ecr.aws/docker/library/busybox:1.36.1
         name: dns-test-eks-eu
         stdin: true
         tty: true
@@ -91,7 +91,7 @@ spec:
             command:
             - nslookup
             - EKS.eu-west-1.amazonaws.com
-      - image: tutum/dnsutils@sha256:d2244ad47219529f1003bd1513f5c99e71655353a3a63624ea9cb19f8393d5fe
+      - image: public.ecr.aws/docker/library/busybox:1.36.1
         name: dns-test-ec2-us
         stdin: true
         tty: true
@@ -104,7 +104,7 @@ spec:
             command:
             - nslookup
             - ec2.us-east-2.amazonaws.com
-      - image: tutum/dnsutils@sha256:d2244ad47219529f1003bd1513f5c99e71655353a3a63624ea9cb19f8393d5fe
+      - image: public.ecr.aws/docker/library/busybox:1.36.1
         name: dns-test-ec2-eu
         stdin: true
         tty: true
@@ -117,7 +117,7 @@ spec:
             command:
             - nslookup
             - ec2.eu-west-2.amazonaws.com
-      - image: tutum/dnsutils@sha256:d2244ad47219529f1003bd1513f5c99e71655353a3a63624ea9cb19f8393d5fe
+      - image: public.ecr.aws/docker/library/busybox:1.36.1
         name: dns-test-ifconfig
         stdin: true
         tty: true
@@ -129,4 +129,4 @@ spec:
           exec:
             command:
             - nslookup
-            - ifconfig.co
+            - ifconfig.co

integration/tests/accessentries/accessentries_test.go

@@ -329,7 +329,8 @@ var _ = Describe("(Integration) [AccessEntries Test]", func() {
 				).Run()
 			Expect(session.ExitCode()).To(Equal(0))
 			Expect(json.Unmarshal(session.Out.Contents(), &output)).To(Succeed())
-			Expect(output).To(HaveLen(2))
+			// Don't check access entries length. AWS may add additional access entries like
+			// a cluster-access-policy/AmazonEKSClusterInsightsPolicy.
 			Expect(output).To(ContainElements(cfg.AccessConfig.AccessEntries))
 		})
 

integration/tests/addons/addons_test.go

@@ -808,7 +808,10 @@ var _ = Describe("(Integration) [EKS Addons test]", func() {
 
 			By("removing all pod identity associations owned by the addon")
 			clusterConfig.Addons[1].PodIdentityAssociations = &[]api.PodIdentityAssociation{}
-			Expect(makeUpdateAddonCMD()).To(RunSuccessfully())
+			// Don't wait for aws-ebs-csi-driver add-on because it won't become healthy without iam perms now.
+			// Update add-on has a bug where we wait even if we don't pass in --wait.
+			// We should fix that bug eventually then we can remove this timeout and fail condition.
+			Expect(makeUpdateAddonCMD("--timeout", "2m")).NotTo(RunSuccessfully())
 			assertAddonHasPodIDs(api.AWSEBSCSIDriverAddon, 0)
 
 			By("migrating an addon to pod identity using the utils command")

integration/tests/enhanced_node_repair/enhanced_node_repair_test.go

@@ -1,7 +1,7 @@
 //go:build integration
 // +build integration
 
-package enhanced_node_repair
+package enhancednoderepair
 
 import (
 	"fmt"
@@ -78,7 +78,7 @@ managedNodeGroups:
 			defer os.Remove(configFile)
 
 			By("testing YAML config generates correct CloudFormation")
-			cmd := params.EksctlCreateCmd.WithArgs(
+			cmd := params.EksctlCreateCmd.WithoutArg("--region", params.Region).WithArgs(
 				"cluster",
 				"--config-file", configFile,
 				"--dry-run",
@@ -112,7 +112,6 @@ managedNodeGroups:
 				"--dry-run",
 			)
 			Expect(cmd).NotTo(RunSuccessfully())
-			Expect(cmd).To(RunWithError(ContainSubstring("only valid with managed nodegroups")))
 		})
 
 		It("should handle invalid YAML configuration gracefully", func() {
@@ -138,7 +137,7 @@ nodeGroups:
 			defer os.Remove(configFile)
 
 			By("testing invalid config is rejected")
-			cmd := params.EksctlCreateCmd.WithArgs(
+			cmd := params.EksctlCreateCmd.WithoutArg("--region", params.Region).WithArgs(
 				"cluster",
 				"--config-file", configFile,
 				"--dry-run",
@@ -147,4 +146,4 @@ nodeGroups:
 			Expect(cmd).NotTo(RunSuccessfully())
 		})
 	})
-})
+})

integration/tests/update/update_cluster_test.go

@@ -250,16 +250,6 @@ var _ = Describe("(Integration) Upgrading cluster", func() {
 		})
 
 		It("should upgrade aws-node", func() {
-			rawClient := getRawClient(context.Background(), clusterProvider)
-			getAWSNodeVersion := func() string {
-				awsNode, err := rawClient.ClientSet().AppsV1().DaemonSets(metav1.NamespaceSystem).Get(context.TODO(), "aws-node", metav1.GetOptions{})
-				Expect(err).NotTo(HaveOccurred())
-				imageTag, err := addons.ImageTag(awsNode.Spec.Template.Spec.Containers[0].Image)
-				Expect(err).NotTo(HaveOccurred())
-				return imageTag
-			}
-			preUpdateAWSNodeVersion := getAWSNodeVersion()
-
 			cmd := params.EksctlUpdateCmd.
 				WithArgs(
 					"addon",
@@ -270,7 +260,6 @@ var _ = Describe("(Integration) Upgrading cluster", func() {
 					"--verbose", "4",
 				)
 			Expect(cmd).To(RunSuccessfully())
-			Eventually(getAWSNodeVersion, addonUpdatePollTimeout, k8sUpdatePollInterval).ShouldNot(Equal(preUpdateAWSNodeVersion))
 		})
 
 		It("should upgrade coredns", func() {

pkg/actions/addon/addon_helper.go

@@ -37,3 +37,17 @@ func (a *Helper) ValidateNodeGroupCreation(ctx context.Context) error {
 	}
 	return nil
 }
+
+func ShouldWaitForAddons(nodes bool, addons []*api.Addon) bool {
+	addonsRequireWait := false
+	for _, a := range addons {
+		addonInfo, ok := api.KnownAddons[a.Name]
+		// Assume unknown add-ons need to wait.
+		if !ok || !addonInfo.DontRequireWait {
+			addonsRequireWait = true
+			break
+		}
+	}
+
+	return nodes && addonsRequireWait
+}