auto mode does not require setting default addons or oidc

eksctl-io · Dec 12, 2024 · e8b2930 · e8b2930
1 parent 84ac23d
commit e8b2930
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 6 deletions.
diff --git a/pkg/apis/eksctl.io/v1alpha5/validation.go b/pkg/apis/eksctl.io/v1alpha5/validation.go
@@ -616,8 +616,13 @@ func (c *ClusterConfig) validateKubernetesNetworkConfig() error {
 	switch strings.ToLower(c.KubernetesNetworkConfig.IPFamily) {
 	case strings.ToLower(IPV4Family), "":
 	case strings.ToLower(IPV6Family):
-		if missing := c.addonContainsManagedAddons([]string{VPCCNIAddon, CoreDNSAddon, KubeProxyAddon}); len(missing) != 0 {
-			return fmt.Errorf("the default core addons must be defined for IPv6; missing addon(s): %s", strings.Join(missing, ", "))
+		if !c.IsAutoModeEnabled() {
+			if missing := c.addonContainsManagedAddons([]string{VPCCNIAddon, CoreDNSAddon, KubeProxyAddon}); len(missing) != 0 {
+				return fmt.Errorf("the default core addons must be defined for IPv6; missing addon(s): %s; either define them or use EKS Auto Mode", strings.Join(missing, ", "))
+			}
+			if c.IAM == nil || c.IAM != nil && IsDisabled(c.IAM.WithOIDC) {
+				return fmt.Errorf("oidc needs to be enabled if IPv6 is set; either set it or use EKS Auto Mode")
+			}
 		}
 
 		unsupportedVersion, err := c.unsupportedVPCCNIAddonVersion()
@@ -629,10 +634,6 @@ func (c *ClusterConfig) validateKubernetesNetworkConfig() error {
 			return fmt.Errorf("%s version must be at least version %s for IPv6", VPCCNIAddon, minimumVPCCNIVersionForIPv6)
 		}
 
-		if c.IAM == nil || c.IAM != nil && IsDisabled(c.IAM.WithOIDC) {
-			return fmt.Errorf("oidc needs to be enabled if IPv6 is set")
-		}
-
 		if version, err := utils.CompareVersions(c.Metadata.Version, Version1_21); err != nil {
 			return fmt.Errorf("failed to convert %s cluster version to semver: %w", c.Metadata.Version, err)
 		} else if version == -1 {

diff --git a/pkg/apis/eksctl.io/v1alpha5/validation_test.go b/pkg/apis/eksctl.io/v1alpha5/validation_test.go
@@ -1159,6 +1159,20 @@ var _ = Describe("ClusterConfig validation", func() {
 					})
 				})
 
+				When("ipFamily is set to IPv6, no managed addons are provided, but auto-mode is used", func() {
+					It("accepts the setting", func() {
+						cfg.VPC.NAT = nil
+						cfg.IAM = &api.ClusterIAM{
+							WithOIDC: api.Enabled(),
+						}
+						cfg.AutoModeConfig = &api.AutoModeConfig{
+							Enabled: aws.Bool(true),
+						}
+						err = api.ValidateClusterConfig(cfg)
+						Expect(err).To(BeNil())
+					})
+				})
+
 				When("the vpc-cni version is configured", func() {
 					When("the version of the vpc-cni is too low", func() {
 						It("returns an error", func() {
@@ -1258,6 +1272,22 @@ var _ = Describe("ClusterConfig validation", func() {
 					})
 				})
 
+				When("iam is not set, but auto-mode is used", func() {
+					It("accepts the setting", func() {
+						cfg.VPC.NAT = nil
+						cfg.Addons = append(cfg.Addons,
+							&api.Addon{Name: api.KubeProxyAddon},
+							&api.Addon{Name: api.CoreDNSAddon},
+							&api.Addon{Name: api.VPCCNIAddon},
+						)
+						cfg.AutoModeConfig = &api.AutoModeConfig{
+							Enabled: aws.Bool(true),
+						}
+						err = api.ValidateClusterConfig(cfg)
+						Expect(err).To(BeNil())
+					})
+				})
+
 				When("iam is set but OIDC is disabled", func() {
 					It("returns an error", func() {
 						cfg.IAM = &api.ClusterIAM{