Merge pull request #6805 from justinsb/cherrypick_6769_release-1.13

Cherry pick of #6769 onto release-1.13
kubernetes · Apr 22, 2019 · 2ce42d6 · 2ce42d6
2 parents 92b4d48 + 51f0490
commit 2ce42d6
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/model/iam.go b/pkg/model/iam.go
@@ -77,6 +77,9 @@ func (b *IAMModelBuilder) Build(c *fi.ModelBuilderContext) error {
 			return fmt.Errorf("unable to parse instance profile name from arn %q: %v", profileARN, err)
 		}
 		err = b.buildIAMTasks(igRole, iamName, c, true)
+		if err != nil {
+			return err
+		}
 	}
 
 	// Generate IAM tasks for each managed role