Merge pull request #4409 from sstarcher/shane/master_describe_regions

master node requires DescribeRegions when using a bucket from another…
2018-02-12 10:43:49 -08:00 · 2018-02-12 10:43:49 -08:00 · 39e25300dd
parent 7616be8a45 b1fdb35118
commit 39e25300dd
3 changed files with 3 additions and 0 deletions
--- a/pkg/model/iam/iam_builder.go
+++ b/pkg/model/iam/iam_builder.go
@ -553,6 +553,7 @@ func addMasterEC2Policies(p *Policy, resource stringorslice.StringOrSlice, legac
 				Effect: StatementEffectAllow,
 				Action: stringorslice.Slice([]string{
 					"ec2:DescribeInstances",      // aws.go
+					"ec2:DescribeRegions",        // s3context.go
 					"ec2:DescribeRouteTables",    // aws.go
 					"ec2:DescribeSecurityGroups", // aws.go
 					"ec2:DescribeSubnets",        // aws.go
--- a/pkg/model/iam/tests/iam_builder_master_strict.json
+++ b/pkg/model/iam/tests/iam_builder_master_strict.json
@ -6,6 +6,7 @@
      "Effect": "Allow",
      "Action": [
        "ec2:DescribeInstances",
+        "ec2:DescribeRegions",
        "ec2:DescribeRouteTables",
        "ec2:DescribeSecurityGroups",
        "ec2:DescribeSubnets",
--- a/pkg/model/iam/tests/iam_builder_master_strict_ecr.json
+++ b/pkg/model/iam/tests/iam_builder_master_strict_ecr.json
@ -6,6 +6,7 @@
      "Effect": "Allow",
      "Action": [
        "ec2:DescribeInstances",
+        "ec2:DescribeRegions",
        "ec2:DescribeRouteTables",
        "ec2:DescribeSecurityGroups",
        "ec2:DescribeSubnets",