Merge pull request #19454 from hashicorp/useAlreadyProvidedSAarn

r/eks_addon: Use service account
hashicorp · May 20, 2021 · 9e69307 · 9e69307
2 parents 38f37d7 + cdfd2ed
commit 9e69307
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/aws/resource_aws_eks_addon.go b/aws/resource_aws_eks_addon.go
@@ -241,7 +241,9 @@ func resourceAwsEksAddonUpdate(ctx context.Context, d *schema.ResourceData, meta
 		input.AddonVersion = aws.String(d.Get("addon_version").(string))
 	}
 
-	if d.HasChange("service_account_role_arn") {
+	// If service account role ARN is already provided, use it. Otherwise, the add-on uses
+	// permissions assigned to the node IAM role.
+	if d.HasChange("service_account_role_arn") || d.Get("service_account_role_arn").(string) != "" {
 		input.ServiceAccountRoleArn = aws.String(d.Get("service_account_role_arn").(string))
 	}