github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-02-14 18:09:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Switch the order of deletion of access entry and iamrole when managedcluster gets deleted. (#1022)

Browse Source 
* Delete access entry before iam role

Signed-off-by: Jeffrey Wong <jeffreywong0417@gmail.com>

* Fix error handling to fix unit test

Signed-off-by: Jeffrey Wong <jeffreywong0417@gmail.com>

* Fix go fmt error

Signed-off-by: Jeffrey Wong <jeffreywong0417@gmail.com>

---------

Signed-off-by: Jeffrey Wong <jeffreywong0417@gmail.com>
Co-authored-by: Jeffrey Wong <jeffreywong0417@gmail.com>
This commit is contained in:
Ramesh Krishna
2025-06-04 02:49:16 -04:00
committed by GitHub
parent 8c494744fa
commit 5bcfeca203
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/registration/register/aws_irsa/hub_driver.go
View File

@@ -28,6 +28,7 @@ import (
)
const (
resourceNotFound = "ResourceNotFoundException"
errNoSuchEntity = "NoSuchEntity"
errEntityAlreadyExists = "EntityAlreadyExists"
trustPolicyTemplatePath = "managed-cluster-policy/TrustPolicy.tmpl"
@@ -77,14 +78,14 @@ func (c *AWSIRSAHubDriver) Cleanup(ctx context.Context, managedCluster *clusterv
return err
}
err = deleteIAMRole(ctx, c.cfg, roleName)
eksClient := eks.NewFromConfig(c.cfg)
_, hubClusterName := commonhelpers.GetAwsAccountIdAndClusterName(c.hubClusterArn)
err = deleteAccessEntry(ctx, eksClient, roleArn, hubClusterName)
if err != nil {
return err
}
eksClient := eks.NewFromConfig(c.cfg)
_, hubClusterName := commonhelpers.GetAwsAccountIdAndClusterName(c.hubClusterArn)
err = deleteAccessEntry(ctx, eksClient, roleArn, hubClusterName)
err = deleteIAMRole(ctx, c.cfg, roleName)
if err != nil {
return err
}
@@ -313,6 +314,10 @@ func deleteAccessEntry(ctx context.Context, eksClient *eks.Client, roleArn strin
_, err := eksClient.DeleteAccessEntry(ctx, params)
if err != nil {
if strings.Contains(err.Error(), resourceNotFound) {
logger.V(4).Error(err, "Access Entry already deleted for HubClusterName", "HubClusterName", hubClusterName)
return nil
}
logger.V(4).Error(err, "Failed to delete Access Entry for HubClusterName", "HubClusterName", hubClusterName)
return err
} else {