fix: check for role attached to instance profile and create if it doe…

…s not exist Signed-off-by: Jonah Back <jonah@jonahback.com>
keikoproj · May 23, 2022 · a1f6192 · a1f6192
1 parent ae893c4
commit a1f6192
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/controllers/providers/aws/iam.go b/controllers/providers/aws/iam.go
@@ -214,7 +214,12 @@ func (w *AwsWorker) CreateScalingGroupRole(name string) (*iam.Role, *iam.Instanc
 		createdProfile = out.InstanceProfile
 		time.Sleep(DefaultInstanceProfilePropagationDelay)
 
-		_, err = w.IamClient.AddRoleToInstanceProfile(&iam.AddRoleToInstanceProfileInput{
+	} else {
+		createdProfile = instanceProfile
+	}
+
+	if len(createdProfile.Roles) == 0 {
+		_, err := w.IamClient.AddRoleToInstanceProfile(&iam.AddRoleToInstanceProfileInput{
 			InstanceProfileName: aws.String(name),
 			RoleName:            aws.String(name),
 		})
@@ -224,10 +229,9 @@ func (w *AwsWorker) CreateScalingGroupRole(name string) (*iam.Role, *iam.Instanc
 					return createdRole, createdProfile, errors.Wrap(err, "failed to attach instance-profile")
 				}
 			}
+		} else {
+			createdProfile.Roles = append(createdProfile.Roles, createdRole)
 		}
-
-	} else {
-		createdProfile = instanceProfile
 	}
 
 	return createdRole, createdProfile, nil