kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4409 from sstarcher/shane/master_describe_regions 

master node requires DescribeRegions when using a bucket from another…
This commit is contained in:
k8s-ci-robot 2018-02-12 10:43:49 -08:00 committed by GitHub
parent 7616be8a45 b1fdb35118
commit 39e25300dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/model/iam/iam_builder.go
View File

@ -553,6 +553,7 @@ func addMasterEC2Policies(p *Policy, resource stringorslice.StringOrSlice, legac
Effect: StatementEffectAllow, Effect: StatementEffectAllow,
Action: stringorslice.Slice([]string{ Action: stringorslice.Slice([]string{
"ec2:DescribeInstances", // aws.go "ec2:DescribeInstances", // aws.go
"ec2:DescribeRegions", // s3context.go
"ec2:DescribeRouteTables", // aws.go "ec2:DescribeRouteTables", // aws.go
"ec2:DescribeSecurityGroups", // aws.go "ec2:DescribeSecurityGroups", // aws.go
"ec2:DescribeSubnets", // aws.go "ec2:DescribeSubnets", // aws.go

1
pkg/model/iam/tests/iam_builder_master_strict.json
View File

@ -6,6 +6,7 @@
"Effect": "Allow", "Effect": "Allow",
"Action": [ "Action": [
"ec2:DescribeInstances", "ec2:DescribeInstances",
"ec2:DescribeRegions",
"ec2:DescribeRouteTables", "ec2:DescribeRouteTables",
"ec2:DescribeSecurityGroups", "ec2:DescribeSecurityGroups",
"ec2:DescribeSubnets", "ec2:DescribeSubnets",

1
pkg/model/iam/tests/iam_builder_master_strict_ecr.json
View File

@ -6,6 +6,7 @@
"Effect": "Allow", "Effect": "Allow",
"Action": [ "Action": [
"ec2:DescribeInstances", "ec2:DescribeInstances",
"ec2:DescribeRegions",
"ec2:DescribeRouteTables", "ec2:DescribeRouteTables",
"ec2:DescribeSecurityGroups", "ec2:DescribeSecurityGroups",
"ec2:DescribeSubnets", "ec2:DescribeSubnets",