Merge pull request #7727 from cPu1/fix-podidentity-creation

Fix creating pod identities
eksctl-io · Apr 25, 2024 · c9ee358 · c9ee358
2 parents dfd89d8 + 3a18083
commit c9ee358
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/pkg/actions/podidentityassociation/creator.go b/pkg/actions/podidentityassociation/creator.go
@@ -45,7 +45,8 @@ func (c *Creator) CreateTasks(ctx context.Context, podIdentityAssociations []api
 	taskTree := &tasks.TaskTree{
 		Parallel: true,
 	}
-	for i, pia := range podIdentityAssociations {
+	for _, pia := range podIdentityAssociations {
+		pia := pia
 		piaCreationTasks := &tasks.TaskTree{
 			Parallel:  false,
 			IsSubTask: true,
@@ -55,7 +56,7 @@ func (c *Creator) CreateTasks(ctx context.Context, podIdentityAssociations []api
 				ctx:                    ctx,
 				info:                   fmt.Sprintf("create IAM role for pod identity association for service account %q", pia.NameString()),
 				clusterName:            c.clusterName,
-				podIdentityAssociation: &podIdentityAssociations[i],
+				podIdentityAssociation: &pia,
 				stackCreator:           c.stackCreator,
 			})
 		}
@@ -75,7 +76,7 @@ func (c *Creator) CreateTasks(ctx context.Context, podIdentityAssociations []api
 			ctx:                    ctx,
 			info:                   fmt.Sprintf("create pod identity association for service account %q", pia.NameString()),
 			clusterName:            c.clusterName,
-			podIdentityAssociation: &podIdentityAssociations[i],
+			podIdentityAssociation: &pia,
 			eksAPI:                 c.eksAPI,
 		})
 		taskTree.Append(piaCreationTasks)

diff --git a/pkg/actions/podidentityassociation/deleter.go b/pkg/actions/podidentityassociation/deleter.go
@@ -116,20 +116,21 @@ func (d *Deleter) DeleteTasks(ctx context.Context, podIDs []Identifier) (*tasks.
 		return taskTree, nil
 	}
 
-	for _, p := range podIDs {
+	for _, podID := range podIDs {
+		podID := podID
 		piaDeletionTasks := &tasks.TaskTree{
 			Parallel:  false,
 			IsSubTask: true,
 		}
-		piaDeletionTasks.Append(d.makeDeleteTask(ctx, p, roleStackNames))
+		piaDeletionTasks.Append(d.makeDeleteTask(ctx, podID, roleStackNames))
 		piaDeletionTasks.Append(&tasks.GenericTask{
-			Description: fmt.Sprintf("delete service account %q", p.IDString()),
+			Description: fmt.Sprintf("delete service account %q", podID.IDString()),
 			Doer: func() error {
 				if err := kubernetes.MaybeDeleteServiceAccount(d.ClientSet, v1.ObjectMeta{
-					Name:      p.ServiceAccountName,
-					Namespace: p.Namespace,
+					Name:      podID.ServiceAccountName,
+					Namespace: podID.Namespace,
 				}); err != nil {
-					return fmt.Errorf("failed to delete service account %q: %w", p.IDString(), err)
+					return fmt.Errorf("failed to delete service account %q: %w", podID.IDString(), err)
 				}
 				return nil
 			},