fix

giantswarm · Nov 8, 2023 · f613385 · f613385
1 parent 2677d00
commit f613385
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/controllers/common_test.go b/controllers/common_test.go
@@ -562,6 +562,7 @@ var clusterAutoscalerRoleInfo = RoleInfo{
   "Version": "2012-10-17",
   "Statement": [
     {
+      "Effect": "Allow",
       "Action": [
         "autoscaling:DescribeAutoScalingGroups",
         "autoscaling:DescribeAutoScalingInstances",
@@ -571,19 +572,18 @@ var clusterAutoscalerRoleInfo = RoleInfo{
         "ec2:DescribeInstanceTypes",
         "ec2:DescribeLaunchTemplateVersions",
       ],
-      "Resource": "*",
-      "Effect": "Allow"
+      "Resource": "*"
     },
     {
+      "Effect": "Allow",
       "Action": [
         "autoscaling:SetDesiredCapacity",
         "autoscaling:TerminateInstanceInAutoScalingGroup",
         "ec2:DescribeImages",
         "ec2:GetInstanceTypesFromInstanceRequirements",
         "eks:DescribeNodegroup"
       ],
-      "Resource": "*",
-      "Effect": "Allow"
+      "Resource": "*"
     }
   ]
 }`,

diff --git a/pkg/iam/cluster_autoscaler_template.go b/pkg/iam/cluster_autoscaler_template.go
@@ -4,6 +4,7 @@ const clusterAutoscalerPolicyTemplate = `{
   "Version": "2012-10-17",
   "Statement": [
      {
+      "Effect": "Allow",
       "Action": [
         "autoscaling:DescribeAutoScalingGroups",
         "autoscaling:DescribeAutoScalingInstances",
@@ -13,19 +14,18 @@ const clusterAutoscalerPolicyTemplate = `{
         "ec2:DescribeInstanceTypes",
         "ec2:DescribeLaunchTemplateVersions",
       ],
-      "Resource": "*",
-      "Effect": "Allow"
+      "Resource": "*"
     },
     {
+      "Effect": "Allow",
       "Action": [
         "autoscaling:SetDesiredCapacity",
         "autoscaling:TerminateInstanceInAutoScalingGroup",
         "ec2:DescribeImages",
         "ec2:GetInstanceTypesFromInstanceRequirements",
         "eks:DescribeNodegroup"
       ],
-      "Resource": "*",
-      "Effect": "Allow"
+      "Resource": "*"
     }
   ]
 }`
diff --git a/pkg/iam/iam.go b/pkg/iam/iam.go
@@ -458,12 +458,6 @@ func (s *IAMService) DeleteRolesForIRSA() error {
 		return err
 	}
 
-	// delete cluster-autoscaler role
-	err = s.deleteRole(roleName(ClusterAutoscalerRole, s.clusterName))
-	if err != nil {
-		return err
-	}
-
 	s.log.Info("finished deleting IAM roles for IRSA")
 	return nil
 }