Skip to content

[Hybrid Nodes] Remove strict requirement of providing a VGW or TGW during cluster creation #8168

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 1 commit into from
Jan 29, 2025
Merged

[Hybrid Nodes] Remove strict requirement of providing a VGW or TGW during cluster creation #8168

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
8 changes: 2 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 @@ -108,14 +108,10 @@ func (c *ClusterConfig) validateRemoteNetworkingConfig() error {
return setNonEmpty("remoteNetworkConfig.remoteNodeNetworks")
}

if c.VPC.ID != "" {
if rnc.VPCGatewayID.IsSet() {
if rnc.VPCGatewayID.IsSet() {
if c.VPC.ID != "" {
return fmt.Errorf("remoteNetworkConfig.vpcGatewayID is not supported when using pre-existing VPC")
}
} else {
if !rnc.VPCGatewayID.IsSet() {
return setNonEmpty("remoteNetworkConfig.vpcGatewayID")
}
// vpcGatewayId must be either a virtual private gateway or a transit gateway
if !rnc.VPCGatewayID.IsTransitGateway() && !rnc.VPCGatewayID.IsVirtualPrivateGateway() {
return fmt.Errorf("invalid value %q provided for remoteNetworkConfig.vpcGatewayID; "+
Expand Down
6 changes: 0 additions & 6 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 @@ -1013,12 +1013,6 @@ var _ = Describe("ClusterConfig validation", func() {
},
expectedErr: "remoteNetworkConfig.vpcGatewayID is not supported when using pre-existing VPC",
}),
Entry("both vpcGatewayID and pre-existing VPC are missing", remoteNetworkConfigEntry{
overrideConfig: func(cc *api.ClusterConfig) {
cc.RemoteNetworkConfig.VPCGatewayID = nil
},
expectedErr: "remoteNetworkConfig.vpcGatewayID must be set and non-empty",
}),
Entry("unsupported vpcGateway type", remoteNetworkConfigEntry{
overrideConfig: func(cc *api.ClusterConfig) {
gatewayID := api.VPCGateway("igw-1234")
Expand Down
2 changes: 2 additions & 0 deletions pkg/cfn/builder/vpc_ipv4.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"strconv"
"strings"

"github.com/kris-nova/logger"
"github.com/weaveworks/eksctl/pkg/awsapi"

gfncfn "github.com/awslabs/goformation/v4/cloudformation/cloudformation"
Expand Down Expand Up @@ -396,6 +397,7 @@ func (v *IPv4VPCResourceSet) addHybridNodesNetworking() {
}
})
default:
logger.Warning("a TGW or VGW was not provided for hybrid nodes connectivity, hence eksctl won't configure any related routes and gateway attachments for your VPC")
return
}
}
Expand Down
2 changes: 1 addition & 1 deletion userdocs/src/usage/hybrid-nodes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ remoteNetworkConfig:
- cidrs: ["10.86.30.0/23"]
```

If your connectivity method of choice does not involve using a TGW or VGW, you must not rely on eksctl to create the VPC for you, and instead provide a pre-existing one. On a related note, if you are using a pre-existing VPC, eksctl won't make any amendments to it, and ensuring all networking requirements are in place falls under your responsibility.
If your connectivity method of choice does not involve using a TGW or VGW, you can omit setting `remoteNetworkConfig.vpcGatewayID` or provide a pre-existing VPC. On a related note, if you are using a pre-existing VPC, eksctl won't make any amendments to it, and ensuring all networking requirements are in place falls under your responsibility.

???+ note
eksctl does not setup any networking infrastructure outside your AWS VPC (i.e. any infrastructure from VGW/TGW to the remote networks)
Expand Down
Loading