Skip to content

[WIP] PCP-4661: Remove dependency on launchTemplate for amiType #972

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

Open
wants to merge 1 commit into
base: spectro-master
Choose a base branch
from
Open

[WIP] PCP-4661: Remove dependency on launchTemplate for amiType #972

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
6 changes: 4 additions & 2 deletions pkg/cloud/services/eks/nodegroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,9 @@ func (s *NodegroupService) createNodegroup() (*eks.Nodegroup, error) {

// Palette have all input for nodepool customization as optionsl.
// Allow creating AWS launch templates without specifying an AMI ID. CAPA will do lookup for the AMI ID.
if managedPool.AMIType != nil && (managedPool.AWSLaunchTemplate == nil /*|| managedPool.AWSLaunchTemplate.AMI.ID == nil*/) {
// PCP-4661: Remove the dependency on AWSLaunchTemplate being empty to set the AMIType.
// PCP-4661: Whatever value is set in spec.amiType should be used to set the AMI type in the nodegroup.
if managedPool.AMIType != nil { // && (managedPool.AWSLaunchTemplate == nil /*|| managedPool.AWSLaunchTemplate.AMI.ID == nil*/) {
input.AmiType = aws.String(string(*managedPool.AMIType))
}
if managedPool.DiskSize != nil {
Expand Down Expand Up @@ -346,7 +348,7 @@ func (s *NodegroupService) reconcileNodegroupVersion(ng *eks.Nodegroup) error {
return fmt.Errorf("nodegroup version is nil")
}

// PCP-3797: Check for nil pointers before dereferencing
// PCP-3797: Check for nil pointers before dereferencing
if ng.Version == nil {
return fmt.Errorf("nodegroup version is nil, nodegroup status: %v", *ng.Status)
}
Expand Down
Loading