Skip to content
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

Jump to bottom

Support separate subnets for LBs and workers #827

Merged
merged 4 commits into from
Oct 28, 2024
Merged

Support separate subnets for LBs and workers #827

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11a2828
Support separate subnets for LBs and workers
mikkeloscar Oct 25, 2024
0ffd9f4
Use kubernetes.io/role/node
mikkeloscar Oct 25, 2024
ec49804
Update comment
mikkeloscar Oct 25, 2024
4e3f754
Rename variable
mikkeloscar Oct 25, 2024
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
31 changes: 18 additions & 13 deletions provisioner/clusterpy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const (
defaultNamespace = "default"
tagNameKubernetesClusterPrefix = "kubernetes.io/cluster/"
subnetELBRoleTagName = "kubernetes.io/role/elb"
subnetNodeRoleTagName = "kubernetes.io/role/node"
resourceLifecycleShared = "shared"
resourceLifecycleOwned = "owned"
mainStackTagKey = "cluster-lifecycle-controller.zalando.org/main-stack"
Expand Down Expand Up @@ -219,16 +220,19 @@ func (p *clusterpyProvisioner) provision(
}

// find the best subnet for each AZ
azInfo := selectSubnetIDs(subnets)
azInfoLBs := selectSubnetIDs(subnets, subnetELBRoleTagName)
azInfoNodes := selectSubnetIDs(subnets, subnetNodeRoleTagName)

// if availability zones are defined, filter the subnet list
if azNames, ok := cluster.ConfigItems[availabilityZonesConfigItemKey]; ok {
azInfo = azInfo.RestrictAZs(strings.Split(azNames, ","))
azInfoLBs = azInfoLBs.RestrictAZs(strings.Split(azNames, ","))
azInfoNodes = azInfoNodes.RestrictAZs(strings.Split(azNames, ","))
}

// TODO legacy, remove once we switch to Values in all clusters
// optional config item to hard-code subnets. This is useful for
// migrating between subnets.
if _, ok := cluster.ConfigItems[subnetsConfigItemKey]; !ok {
cluster.ConfigItems[subnetsConfigItemKey] = azInfo.SubnetsByAZ()[subnetAllAZName]
cluster.ConfigItems[subnetsConfigItemKey] = azInfoNodes.SubnetsByAZ()[subnetAllAZName]
}

apiURL, err := url.Parse(cluster.APIServerURL)
Expand Down Expand Up @@ -258,9 +262,10 @@ func (p *clusterpyProvisioner) provision(
}

values := map[string]interface{}{
subnetsValueKey: azInfo.SubnetsByAZ(),
availabilityZonesValueKey: azInfo.AvailabilityZones(),
subnetIPV6CIDRsKey: strings.Join(azInfo.SubnetIPv6CIDRs(), ","),
subnetsValueKey: azInfoNodes.SubnetsByAZ(),
availabilityZonesValueKey: azInfoNodes.AvailabilityZones(),
subnetIPV6CIDRsKey: strings.Join(azInfoNodes.SubnetIPv6CIDRs(), ","),
"lb_subnets": azInfoLBs.SubnetsByAZ(),
Copy link
Member

Choose a reason for hiding this comment

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

This is new, do we need in a similar change in provisionNodePool ?

Copy link
Member

@AlexanderYastrebov AlexanderYastrebov Oct 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I guess this is handled by azInfo: azInfoWorkers change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This will be used like this: zalando-incubator/kubernetes-on-aws#8440

"hosted_zone": hostedZone,
"load_balancer_certificate": loadBalancerCert.ID(),
"vpc_ipv4_cidr": aws.StringValue(vpc.CidrBlock),
Expand Down Expand Up @@ -350,7 +355,7 @@ func (p *clusterpyProvisioner) provision(
encodeUserData: true,
instanceTypes: instanceTypes,
},
azInfo: azInfo,
azInfo: azInfoNodes,
}

karpenterProvisioner, err := NewKarpenterNodePoolProvisioner(
Expand Down Expand Up @@ -618,13 +623,13 @@ func subnetNot(predicate func(*ec2.Subnet) bool) func(*ec2.Subnet) bool {
}
}

// selectSubnetIDs finds the best suiting subnets based on tags for each AZ.
// selectSubnetIDs finds the best suiting subnets based on tag for each AZ.
//
// It follows almost the same logic for finding subnets as the
// kube-controller-manager when finding subnets for ELBs used for services of
// type LoadBalancer.
// https://github.com/kubernetes/kubernetes/blob/65efeee64f772e0f38037e91a677138a335a7570/pkg/cloudprovider/providers/aws/aws.go#L2949-L3027
func selectSubnetIDs(subnets []*ec2.Subnet) *AZInfo {
func selectSubnetIDs(subnets []*ec2.Subnet, tag string) *AZInfo {
subnetsByAZ := make(map[string]*ec2.Subnet)
for _, subnet := range subnets {
az := aws.StringValue(subnet.AvailabilityZone)
Expand All @@ -635,11 +640,11 @@ func selectSubnetIDs(subnets []*ec2.Subnet) *AZInfo {
continue
}

// prefer subnet with an ELB role tag
// prefer subnet with a tag
existingTags := tagsToMap(existing.Tags)
subnetTags := tagsToMap(subnet.Tags)
_, existingHasTag := existingTags[subnetELBRoleTagName]
_, subnetHasTag := subnetTags[subnetELBRoleTagName]
_, existingHasTag := existingTags[tag]
_, subnetHasTag := subnetTags[tag]

if existingHasTag != subnetHasTag {
if subnetHasTag {
Expand Down
Loading