Skip to content

EKS Auto Mode should not require setting default addons or OIDC #8082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TiberiuGC merged 1 commit into from
Dec 13, 2024
Merged

EKS Auto Mode should not require setting default addons or OIDC #8082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions pkg/apis/eksctl.io/v1alpha5/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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 {
Expand Down
30 changes: 30 additions & 0 deletions pkg/apis/eksctl.io/v1alpha5/validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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{
Expand Down