Skip to content

fix: report specific missing security group IDs in EC2NodeClass status #9036

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
r-aju wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −0
Open

fix: report specific missing security group IDs in EC2NodeClass status #9036

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
18 changes: 18 additions & 0 deletions pkg/controllers/nodeclass/securitygroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ import (
"context"
"fmt"
"sort"
"strings"
"time"

"github.com/aws/aws-sdk-go-v2/aws"
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
"github.com/samber/lo"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
Expand All @@ -43,6 +45,22 @@ func (sg *SecurityGroup) Reconcile(ctx context.Context, nodeClass *v1.EC2NodeCla
if err != nil {
return reconcile.Result{}, fmt.Errorf("getting security groups, %w", err)
}
// Collect all explicitly requested security group IDs to detect non-existent ones.
requestedIDs := lo.FilterMap(nodeClass.Spec.SecurityGroupSelectorTerms, func(term v1.SecurityGroupSelectorTerm, _ int) (string, bool) {
return term.ID, term.ID != ""
})
foundIDs := lo.Map(securityGroups, func(sg ec2types.SecurityGroup, _ int) string {
return aws.ToString(sg.GroupId)
})
missingIDs := lo.Filter(requestedIDs, func(id string, _ int) bool {
return !lo.Contains(foundIDs, id)
})
if len(missingIDs) > 0 {
nodeClass.Status.SecurityGroups = nil
nodeClass.StatusConditions().SetFalse(v1.ConditionTypeSecurityGroupsReady, "SecurityGroupsNotFound",
fmt.Sprintf("Security groups do not exist: [%s]", strings.Join(missingIDs, ", ")))
return reconcile.Result{RequeueAfter: time.Minute}, nil
}
if len(securityGroups) == 0 && len(nodeClass.Spec.SecurityGroupSelectorTerms) > 0 {
nodeClass.Status.SecurityGroups = nil
nodeClass.StatusConditions().SetFalse(v1.ConditionTypeSecurityGroupsReady, "SecurityGroupsNotFound", "SecurityGroupSelector did not match any SecurityGroups")
Expand Down