Skip to content

operator: allow NodePool to override default subnet filter #5

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-robot merged 1 commit into from
Jan 26, 2021
Merged

operator: allow NodePool to override default subnet filter #5

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
28 changes: 15 additions & 13 deletions hypershift-operator/controllers/nodepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,19 +204,7 @@ func generateScalableResources(client ctrlclient.Client, ctx context.Context, in
return nil, nil, fmt.Errorf("error finding AMI. Found: %v. Error: %v", found, err)
}

// TODO (alberto): remove hardcoded "a" zone and come up with a solution
// for automation across az
// e.g have a "locations" field in the nodeGroup or expose the subnet in the nodeGroup
subnet := &capiaws.AWSResourceReference{
Filters: []capiaws.Filter{
{
Name: "tag:Name",
Values: []string{
fmt.Sprintf("%s-private-%sa", infraName, region),
},
},
},
}
subnet := &capiaws.AWSResourceReference{}
if nodePool.Spec.Platform.AWS.Subnet != nil {
subnet.ID = nodePool.Spec.Platform.AWS.Subnet.ID
subnet.ARN = nodePool.Spec.Platform.AWS.Subnet.ARN
Expand All @@ -227,6 +215,20 @@ func generateScalableResources(client ctrlclient.Client, ctx context.Context, in
}
subnet.Filters = append(subnet.Filters, filter)
}
} else {
// TODO (alberto): remove hardcoded "a" zone and come up with a solution
// for automation across az
// e.g have a "locations" field in the nodeGroup or expose the subnet in the nodeGroup
subnet = &capiaws.AWSResourceReference{
Filters: []capiaws.Filter{
{
Name: "tag:Name",
Values: []string{
fmt.Sprintf("%s-private-%sa", infraName, region),
},
},
},
}
}

instanceProfile := fmt.Sprintf("%s-worker-profile", infraName)
Expand Down