Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/eks_addon: Use service account #19454

Merged
merged 2 commits into from
May 20, 2021
Merged

r/eks_addon: Use service account #19454

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dbbe18
Use service_account_role_arn if already provided.
kreativka May 17, 2021
cdfd2ed
r/eks_addon: Fix nil check
YakDriver May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion aws/resource_aws_eks_addon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

Expand Down