Merge branch 'main' into add-events-based-metrics

aws · Nov 14, 2024 · a3462ac · a3462ac
2 parents 34502eb + 992689c
commit a3462ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/charts/karpenter/templates/clusterrole-core.yaml b/charts/karpenter/templates/clusterrole-core.yaml
@@ -44,7 +44,7 @@ rules:
   - apiGroups: ["policy"]
     resources: ["poddisruptionbudgets"]
     verbs: ["get", "list", "watch"]
-  - apiGroups: []
+  - apiGroups: [""]
     resources: ["events"]
     verbs: ["get", list, "watch"]
   # Write

diff --git a/pkg/providers/instance/instance.go b/pkg/providers/instance/instance.go
@@ -157,7 +157,7 @@ func (p *DefaultProvider) List(ctx context.Context) ([]*Instance, error) {
 				Values: []string{v1.NodeClassTagKey},
 			},
 			{
-				Name:   aws.String(v1.EKSClusterNameTagKey),
+				Name:   aws.String(fmt.Sprintf("tag:%s", v1.EKSClusterNameTagKey)),
 				Values: []string{options.FromContext(ctx).ClusterName},
 			},
 			instanceStateFilter,
@@ -166,10 +166,10 @@ func (p *DefaultProvider) List(ctx context.Context) ([]*Instance, error) {
 
 	for paginator.HasMorePages() {
 		page, err := paginator.NextPage(ctx)
-		out.Reservations = append(out.Reservations, page.Reservations...)
 		if err != nil {
 			return nil, fmt.Errorf("describing ec2 instances, %w", err)
 		}
+		out.Reservations = append(out.Reservations, page.Reservations...)
 	}
 	instances, err := instancesFromOutput(out)
 	return instances, cloudprovider.IgnoreNodeClaimNotFoundError(err)