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

Merge pull request #6039 from rhyas/fix_s3_encryption_role 

Fix s3 encryption role
This commit is contained in:
k8s-ci-robot 2018-11-05 02:29:41 -08:00 committed by GitHub
parent e5b2b9eddb e0948842f3
commit 85446af3bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,7 +314,7 @@ func (b *PolicyBuilder) AddS3Permissions(p *Policy) (*Policy, error) {
p.Statement = append(p.Statement, &Statement{ p.Statement = append(p.Statement, &Statement{
Effect: StatementEffectAllow, Effect: StatementEffectAllow,
Action: stringorslice.Of("s3:GetBucketLocation", "s3:ListBucket"), Action: stringorslice.Of("s3:GetBucketLocation", "s3:GetEncryptionConfiguration", "s3:ListBucket"),
Resource: stringorslice.Slice([]string{ Resource: stringorslice.Slice([]string{
strings.Join([]string{b.IAMPrefix(), ":s3:::", s3Path.Bucket()}, ""), strings.Join([]string{b.IAMPrefix(), ":s3:::", s3Path.Bucket()}, ""),
}), }),

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

@ -48,6 +48,7 @@
"Effect": "Allow", "Effect": "Allow",
"Action": [ "Action": [
"s3:GetBucketLocation", "s3:GetBucketLocation",
"s3:GetEncryptionConfiguration",
"s3:ListBucket" "s3:ListBucket"
], ],
"Resource": [ "Resource": [

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

@ -138,6 +138,7 @@
"Effect": "Allow", "Effect": "Allow",
"Action": [ "Action": [
"s3:GetBucketLocation", "s3:GetBucketLocation",
"s3:GetEncryptionConfiguration",
"s3:ListBucket" "s3:ListBucket"
], ],
"Resource": [ "Resource": [

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

@ -138,6 +138,7 @@
"Effect": "Allow", "Effect": "Allow",
"Action": [ "Action": [
"s3:GetBucketLocation", "s3:GetBucketLocation",
"s3:GetEncryptionConfiguration",
"s3:ListBucket" "s3:ListBucket"
], ],
"Resource": [ "Resource": [

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

@ -15,6 +15,7 @@
"Effect": "Allow", "Effect": "Allow",
"Action": [ "Action": [
"s3:GetBucketLocation", "s3:GetBucketLocation",
"s3:GetEncryptionConfiguration",
"s3:ListBucket" "s3:ListBucket"
], ],
"Resource": [ "Resource": [

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

@ -15,6 +15,7 @@
"Effect": "Allow", "Effect": "Allow",
"Action": [ "Action": [
"s3:GetBucketLocation", "s3:GetBucketLocation",
"s3:GetEncryptionConfiguration",
"s3:ListBucket" "s3:ListBucket"
], ],
"Resource": [ "Resource": [

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

@ -15,6 +15,7 @@
"Effect": "Allow", "Effect": "Allow",
"Action": [ "Action": [
"s3:GetBucketLocation", "s3:GetBucketLocation",
"s3:GetEncryptionConfiguration",
"s3:ListBucket" "s3:ListBucket"
], ],
"Resource": [ "Resource": [