-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement updating and deleting pod identity associations (#7315)
* Implement `update podidentityassociation` * Implement `delete podidentityassociation` * change create task order * add integration test * delete IAM role stacks on cluster deletion * move validations from cluster config level to command config level * avoid duplicating stack deletion tasks due to passing name by reference * fix integration tests * add eksctl prefix to integrationt test IAM roles * make IAM roles trust the production EKS Service Principal --------- Co-authored-by: Tibi <110664232+TiberiuGC@users.noreply.github.com>
- Loading branch information
Showing
29 changed files
with
2,130 additions
and
133 deletions.
There are no files selected for viewing
455 changes: 455 additions & 0 deletions
455
integration/tests/pod_identity_associations/pod_identity_associations_test.go
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,186 @@ | ||
| package podidentityassociation | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| cfntypes "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" | ||
|
|
||
| "golang.org/x/exp/slices" | ||
|
|
||
| "github.com/aws/aws-sdk-go-v2/aws" | ||
| "github.com/aws/aws-sdk-go-v2/service/eks" | ||
|
|
||
| "github.com/kris-nova/logger" | ||
|
|
||
| api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" | ||
| "github.com/weaveworks/eksctl/pkg/cfn/manager" | ||
| "github.com/weaveworks/eksctl/pkg/utils/tasks" | ||
| ) | ||
|
|
||
| // A StackLister lists and describes CloudFormation stacks. | ||
| type StackLister interface { | ||
| ListStackNames(ctx context.Context, regExp string) ([]string, error) | ||
| DescribeStack(ctx context.Context, stack *manager.Stack) (*manager.Stack, error) | ||
| } | ||
|
|
||
| // A StackDeleter lists and deletes CloudFormation stacks. | ||
| type StackDeleter interface { | ||
| StackLister | ||
| DeleteStackBySpecSync(ctx context.Context, stack *cfntypes.Stack, errCh chan error) error | ||
| } | ||
|
|
||
| // APILister lists pod identity associations using the EKS API. | ||
| type APILister interface { | ||
| ListPodIdentityAssociations(ctx context.Context, params *eks.ListPodIdentityAssociationsInput, optFns ...func(*eks.Options)) (*eks.ListPodIdentityAssociationsOutput, error) | ||
| } | ||
|
|
||
| // APIDeleter lists and deletes pod identity associations using the EKS API. | ||
| type APIDeleter interface { | ||
| APILister | ||
| DeletePodIdentityAssociation(ctx context.Context, params *eks.DeletePodIdentityAssociationInput, optFns ...func(*eks.Options)) (*eks.DeletePodIdentityAssociationOutput, error) | ||
| } | ||
|
|
||
| // A Deleter deletes pod identity associations. | ||
| type Deleter struct { | ||
| // ClusterName is the cluster name. | ||
| ClusterName string | ||
| // StackDeleter is used to delete stacks. | ||
| StackDeleter StackDeleter | ||
| // APIDeleter deletes pod identity associations using the EKS API. | ||
| APIDeleter APIDeleter | ||
| } | ||
|
|
||
| // Identifier represents a pod identity association. | ||
| type Identifier struct { | ||
| // Namespace is the namespace the service account belongs to. | ||
| Namespace string | ||
| // ServiceAccountName is the name of the Kubernetes ServiceAccount. | ||
| ServiceAccountName string | ||
| } | ||
|
|
||
| func NewDeleter(clusterName string, stackDeleter StackDeleter, apiDeleter APIDeleter) *Deleter { | ||
| return &Deleter{ | ||
| ClusterName: clusterName, | ||
| StackDeleter: stackDeleter, | ||
| APIDeleter: apiDeleter, | ||
| } | ||
| } | ||
|
|
||
| // Delete deletes the specified podIdentityAssociations. | ||
| func (d *Deleter) Delete(ctx context.Context, podIDs []Identifier) error { | ||
| tasks, err := d.DeleteTasks(ctx, podIDs) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return runAllTasks(tasks) | ||
| } | ||
|
|
||
| func (d *Deleter) DeleteTasks(ctx context.Context, podIDs []Identifier) (*tasks.TaskTree, error) { | ||
| roleStackNames, err := d.StackDeleter.ListStackNames(ctx, fmt.Sprintf("^%s*", makeStackNamePrefix(d.ClusterName))) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error listing stack names for pod identity associations: %w", err) | ||
| } | ||
| taskTree := &tasks.TaskTree{Parallel: true} | ||
|
|
||
| // this is true during cluster deletion, when no association identifier is given as user input, | ||
| // instead we will delete all pod-identity-role stacks for the cluster | ||
| if len(podIDs) == 0 { | ||
| for _, stackName := range roleStackNames { | ||
| name := strings.Clone(stackName) | ||
| taskTree.Append(&tasks.GenericTask{ | ||
| Description: fmt.Sprintf("deleting IAM resources stack %q", stackName), | ||
| Doer: func() error { | ||
| return d.deleteRoleStack(ctx, name) | ||
| }, | ||
| }) | ||
| } | ||
| return taskTree, nil | ||
| } | ||
|
|
||
| for _, p := range podIDs { | ||
| taskTree.Append(d.makeDeleteTask(ctx, p, roleStackNames)) | ||
| } | ||
| return taskTree, nil | ||
| } | ||
|
|
||
| func (d *Deleter) makeDeleteTask(ctx context.Context, p Identifier, roleStackNames []string) tasks.Task { | ||
| podIdentityAssociationID := makeID(p.Namespace, p.ServiceAccountName) | ||
| return &tasks.GenericTask{ | ||
| Description: fmt.Sprintf("delete pod identity association %q", podIdentityAssociationID), | ||
| Doer: func() error { | ||
| if err := d.deletePodIdentityAssociation(ctx, p, roleStackNames, podIdentityAssociationID); err != nil { | ||
| return fmt.Errorf("error deleting pod identity association %q: %w", podIdentityAssociationID, err) | ||
| } | ||
| return nil | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func (d *Deleter) deletePodIdentityAssociation(ctx context.Context, p Identifier, roleStackNames []string, podIdentityAssociationID string) error { | ||
| output, err := d.APIDeleter.ListPodIdentityAssociations(ctx, &eks.ListPodIdentityAssociationsInput{ | ||
| ClusterName: aws.String(d.ClusterName), | ||
| Namespace: aws.String(p.Namespace), | ||
| ServiceAccount: aws.String(p.ServiceAccountName), | ||
| }) | ||
| if err != nil { | ||
| return fmt.Errorf("listing pod identity associations: %w", err) | ||
| } | ||
| switch len(output.Associations) { | ||
| case 0: | ||
| logger.Warning("pod identity association %q not found", podIdentityAssociationID) | ||
| default: | ||
| return fmt.Errorf("expected to find only 1 pod identity association for %q; got %d", podIdentityAssociationID, len(output.Associations)) | ||
| case 1: | ||
| if _, err := d.APIDeleter.DeletePodIdentityAssociation(ctx, &eks.DeletePodIdentityAssociationInput{ | ||
| ClusterName: aws.String(d.ClusterName), | ||
| AssociationId: output.Associations[0].AssociationId, | ||
| }); err != nil { | ||
| return fmt.Errorf("deleting pod identity association: %w", err) | ||
| } | ||
| } | ||
|
|
||
| stackName := MakeStackName(d.ClusterName, p.Namespace, p.ServiceAccountName) | ||
| if !slices.Contains(roleStackNames, stackName) { | ||
| return nil | ||
| } | ||
| logger.Info("deleting IAM resources stack %q for pod identity association %q", stackName, podIdentityAssociationID) | ||
| return d.deleteRoleStack(ctx, stackName) | ||
| } | ||
|
|
||
| func (d *Deleter) deleteRoleStack(ctx context.Context, stackName string) error { | ||
| stack, err := d.StackDeleter.DescribeStack(ctx, &manager.Stack{ | ||
| StackName: aws.String(stackName), | ||
| }) | ||
| if err != nil { | ||
| return fmt.Errorf("describing stack %q: %w", stackName, err) | ||
| } | ||
|
|
||
| deleteStackCh := make(chan error) | ||
| if err := d.StackDeleter.DeleteStackBySpecSync(ctx, stack, deleteStackCh); err != nil { | ||
| return fmt.Errorf("deleting stack %q for IAM role: %w", stackName, err) | ||
| } | ||
| select { | ||
| case err := <-deleteStackCh: | ||
| return err | ||
| case <-ctx.Done(): | ||
| return fmt.Errorf("timed out waiting for deletion of pod identity association: %w", ctx.Err()) | ||
| } | ||
| } | ||
|
|
||
| // ToIdentifiers maps a list of PodIdentityAssociations to a list of Identifiers. | ||
| func ToIdentifiers(podIdentityAssociations []api.PodIdentityAssociation) []Identifier { | ||
| identifiers := make([]Identifier, len(podIdentityAssociations)) | ||
| for i, p := range podIdentityAssociations { | ||
| identifiers[i] = Identifier{ | ||
| Namespace: p.Namespace, | ||
| ServiceAccountName: p.ServiceAccountName, | ||
| } | ||
| } | ||
| return identifiers | ||
| } | ||
|
|
||
| func makeID(namespace, serviceAccountName string) string { | ||
| return fmt.Sprintf("%s/%s", namespace, serviceAccountName) | ||
| } |
Oops, something went wrong.