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

Automated cherry pick of #9867: only apply external policy tasks on non-shared iam #9924: Only add additional policies to kops managed IAMRoles #9948

Merged
merged 2 commits into from
Sep 16, 2020
Merged

Automated cherry pick of #9867: only apply external policy tasks on non-shared iam #9924: Only add additional policies to kops managed IAMRoles #9948

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c82aa89
only apply external policy tasks on non-shared iam
kesor Sep 10, 2020
73a899b
Only add additional policies to kops managed IAMRoles
Sep 12, 2020
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: 2 additions & 2 deletions pkg/model/iam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func (b *IAMModelBuilder) buildIAMTasks(igRole kops.InstanceGroupRole, iamName s
}

// Create External Policy tasks
{
if !shared {
var externalPolicies []string

if b.Cluster.Spec.ExternalPolicies != nil {
Expand All @@ -187,7 +187,7 @@ func (b *IAMModelBuilder) buildIAMTasks(igRole kops.InstanceGroupRole, iamName s
}

// Generate additional policies if needed, and attach to existing role
{
if !shared {
additionalPolicy := ""
if b.Cluster.Spec.AdditionalPolicies != nil {
additionalPolicies := *(b.Cluster.Spec.AdditionalPolicies)
Expand Down