Skip to content

Auto allocate ipv6 #4315

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
merged 8 commits into from
Oct 13, 2021
Merged

Auto allocate ipv6 #4315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b0d7c2b
Check if managed addons are set when ipv6 is enabled
Skarlso Oct 5, 2021
f3e3d1a
Add OIDC check for ipv6 cluster
Skarlso Oct 5, 2021
4666869
Add version check if ipv6 is defined
Skarlso Oct 5, 2021
ebe72a7
Setting vpc.NAT is not allowed with ipv6
Skarlso Oct 6, 2021
9fdc667
serviceIPv4CIDR is not supported with ipv6
Skarlso Oct 6, 2021
6bc7e76
Merge branch 'ipv6' into service_ipv4_cidr
Skarlso Oct 6, 2021
cbb0d74
AutoAllocateIPv6 is not supported together with ipv6
Skarlso Oct 6, 2021
eb4c1ed
Merge branch 'ipv6' into auto-allocate-ipv6
Skarlso Oct 13, 2021
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
4 changes: 4 additions & 0 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 @@ -187,6 +187,10 @@ func (c *ClusterConfig) ValidateVPCConfig() error {
if c.KubernetesNetworkConfig != nil && c.KubernetesNetworkConfig.ServiceIPv4CIDR != "" {
return fmt.Errorf("service ipv4 cidr is not supported with IPv6")
}

if IsEnabled(c.VPC.AutoAllocateIPv6) {
return fmt.Errorf("auto allocate ipv6 is not supported with IPv6")
}
}
}

Expand Down
39 changes: 19 additions & 20 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 @@ -563,26 +563,6 @@ var _ = Describe("ClusterConfig validation", func() {
Expect(err).ToNot(HaveOccurred())
})
})
When("ipFamily is set ot IPv6 but version is not or too low", func() {
Copy link
Contributor Author

@Skarlso Skarlso Oct 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a duplicate...

It("returns an error", func() {
ipv6 := string(api.IPV6Family)
cfg.VPC.IPFamily = &ipv6
cfg.Addons = append(cfg.Addons,
&api.Addon{Name: api.KubeProxyAddon},
&api.Addon{Name: api.CoreDNSAddon},
&api.Addon{Name: api.VPCCNIAddon},
)
cfg.IAM = &api.ClusterIAM{
WithOIDC: api.Enabled(),
}
cfg.Metadata.Version = ""
err = cfg.ValidateVPCConfig()
Expect(err).To(MatchError(ContainSubstring("failed to convert cluster version to semver: unable to parse first version")))
cfg.Metadata.Version = api.Version1_12
err = cfg.ValidateVPCConfig()
Expect(err).To(MatchError(ContainSubstring("cluster version must be >= 1.21")))
})
})
When("ipFamily is set ot IPv6 but version is not or too low", func() {
It("returns an error", func() {
ipv6 := string(api.IPV6Family)
Expand Down Expand Up @@ -693,6 +673,25 @@ var _ = Describe("ClusterConfig validation", func() {
Expect(err).To(MatchError(ContainSubstring("service ipv4 cidr is not supported with IPv6")))
})
})
When("ipFamily is set to IPv6 and AutoAllocateIPv6 is set", func() {
It("it returns an error", func() {
ipv6 := string(api.IPV6Family)
cfg.VPC.IPFamily = &ipv6
cfg.VPC.AutoAllocateIPv6 = api.Enabled()
cfg.Metadata.Version = api.Version1_22
cfg.IAM = &api.ClusterIAM{
WithOIDC: api.Enabled(),
}
cfg.Addons = append(cfg.Addons,
&api.Addon{Name: api.KubeProxyAddon},
&api.Addon{Name: api.CoreDNSAddon},
&api.Addon{Name: api.VPCCNIAddon},
)
cfg.VPC.NAT = nil
err = cfg.ValidateVPCConfig()
Expect(err).To(MatchError(ContainSubstring("auto allocate ipv6 is not supported with IPv6")))
})
})
})

Context("CIDRs", func() {
Expand Down
1 change: 1 addition & 0 deletions userdocs/src/usage/vpc-networking.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ This is an in config file setting only. When IPv6 is set, the following restrict
- managed addons are defined as shows above
- version must be => 1.21
- `vpc.NAT` and `serviceIPv4CIDR` fields are created by eksctl for ipv6 clusters and thus, are not supported configuration options
- AutoAllocateIPv6 is not supported together with IPv6

The default value is `IPv4`.

Expand Down