Skip to content

CORS-2890: aws/machines: add CAPI sg, subnet filters #8006

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
openshift-merge-bot merged 2 commits into from
Feb 14, 2024
Merged

CORS-2890: aws/machines: add CAPI sg, subnet filters #8006

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
771525b
aws/machines: add CAPI sg, subnet filters
patrickdillon Dec 8, 2023
015b312
fixup! aws/machines: add CAPI sg, subnet filters
patrickdillon Feb 13, 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
65 changes: 50 additions & 15 deletions pkg/asset/machines/aws/machines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,15 @@ func Machines(clusterID string, region string, subnets map[string]string, pool *
}
if subnet == "" {
domain.Subnet.Type = machinev1.AWSFiltersReferenceType
domain.Subnet.Filters = &[]machinev1.AWSResourceFilter{{
Name: "tag:Name",
Values: []string{fmt.Sprintf("%s-private-%s", clusterID, zone)},
}}
domain.Subnet.Filters = &[]machinev1.AWSResourceFilter{
{
Name: "tag:Name",
Values: []string{
fmt.Sprintf("%s-private-%s", clusterID, zone), // legacy Terraform config, TODO remove
fmt.Sprintf("%s-subnet-private-%s", clusterID, zone),
},
},
}
} else {
domain.Subnet.Type = machinev1.AWSIDReferenceType
domain.Subnet.ID = pointer.String(subnet)
Expand Down Expand Up @@ -178,12 +183,35 @@ func provider(in *machineProviderInput) (*machineapi.AWSMachineProviderConfig, e
return nil, errors.Wrap(err, "failed to create machineapi.TagSpecifications from UserTags")
}

securityGroups := []machineapi.AWSResourceReference{{
Filters: []machineapi.Filter{{
sgFilters := []machineapi.Filter{
{
Name: "tag:Name",
Values: []string{fmt.Sprintf("%s-%s-sg", in.clusterID, in.role)},
}},
}}
Values: []string{fmt.Sprintf("%s-%s-sg", in.clusterID, in.role)}, // legacy Terraform config, remove with Terraform
},
{
Name: "tag:Name",
Values: []string{fmt.Sprintf("%s-node", in.clusterID)},
},
{
Name: "tag:Name",
Values: []string{fmt.Sprintf("%s-lb", in.clusterID)},
},
}

if in.role == "master" {
cpFilter := machineapi.Filter{
Name: "tag:Name",
Values: []string{fmt.Sprintf("%s-controlplane", in.clusterID)},
}
sgFilters = append(sgFilters, cpFilter)
}

securityGroups := []machineapi.AWSResourceReference{}
for _, filter := range sgFilters {
securityGroups = append(securityGroups, machineapi.AWSResourceReference{
Filters: []machineapi.Filter{filter},
})
}
securityGroupsIn := []machineapi.AWSResourceReference{}
for _, sgID := range in.securityGroupIDs {
sgID := sgID
Expand Down Expand Up @@ -223,17 +251,24 @@ func provider(in *machineProviderInput) (*machineapi.AWSMachineProviderConfig, e
SecurityGroups: securityGroups,
}

subnetName := fmt.Sprintf("%s-private-%s", in.clusterID, in.zone)
visibility := "private"
if in.publicSubnet {
config.PublicIP = pointer.Bool(in.publicSubnet)
subnetName = fmt.Sprintf("%s-public-%s", in.clusterID, in.zone)
visibility = "public"
}

subnetFilters := []machineapi.Filter{
{
Name: "tag:Name",
Values: []string{
fmt.Sprintf("%s-%s-%s", in.clusterID, visibility, in.zone),
fmt.Sprintf("%s-subnet-%s-%s", in.clusterID, visibility, in.zone), // legacy Terraform config, remove with Terraform
},
},
}

if in.subnet == "" {
config.Subnet.Filters = []machineapi.Filter{{
Name: "tag:Name",
Values: []string{subnetName},
}}
config.Subnet.Filters = subnetFilters
} else {
config.Subnet.ID = pointer.String(in.subnet)
}
Expand Down