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

Merge pull request #6861 from granular-ryanbonham/DescribeLaunchTemplateVersions 

Support Scale from 0 with Lauch Templates
This commit is contained in:
Kubernetes Prow Robot 2019-05-01 18:54:18 -07:00 committed by GitHub
parent 8b9a91fe28 54ef99ef54
commit 06b81aeae6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -739,6 +739,7 @@ func addMasterASPolicies(p *Policy, resource stringorslice.StringOrSlice, legacy
"autoscaling:SetDesiredCapacity", "autoscaling:SetDesiredCapacity",
"autoscaling:TerminateInstanceInAutoScalingGroup", "autoscaling:TerminateInstanceInAutoScalingGroup",
"autoscaling:UpdateAutoScalingGroup", "autoscaling:UpdateAutoScalingGroup",
"ec2:DescribeLaunchTemplateVersions",
}), }),
Resource: resource, Resource: resource,
}) })
@ -752,6 +753,7 @@ func addMasterASPolicies(p *Policy, resource stringorslice.StringOrSlice, legacy
"autoscaling:DescribeAutoScalingGroups", // aws_instancegroups.go "autoscaling:DescribeAutoScalingGroups", // aws_instancegroups.go
"autoscaling:DescribeLaunchConfigurations", // aws.go "autoscaling:DescribeLaunchConfigurations", // aws.go
"autoscaling:DescribeTags", // auto_scaling.go "autoscaling:DescribeTags", // auto_scaling.go
"ec2:DescribeLaunchTemplateVersions",
), ),
Resource: resource, Resource: resource,
}, },

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

@ -19,7 +19,8 @@
"autoscaling:DescribeTags", "autoscaling:DescribeTags",
"autoscaling:SetDesiredCapacity", "autoscaling:SetDesiredCapacity",
"autoscaling:TerminateInstanceInAutoScalingGroup", "autoscaling:TerminateInstanceInAutoScalingGroup",
"autoscaling:UpdateAutoScalingGroup" "autoscaling:UpdateAutoScalingGroup",
"ec2:DescribeLaunchTemplateVersions"
], ],
"Resource": [ "Resource": [
"*" "*"

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

@ -55,7 +55,8 @@
"Action": [ "Action": [
"autoscaling:DescribeAutoScalingGroups", "autoscaling:DescribeAutoScalingGroups",
"autoscaling:DescribeLaunchConfigurations", "autoscaling:DescribeLaunchConfigurations",
"autoscaling:DescribeTags" "autoscaling:DescribeTags",
"ec2:DescribeLaunchTemplateVersions"
], ],
"Resource": [ "Resource": [
"*" "*"

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

@ -55,7 +55,8 @@
"Action": [ "Action": [
"autoscaling:DescribeAutoScalingGroups", "autoscaling:DescribeAutoScalingGroups",
"autoscaling:DescribeLaunchConfigurations", "autoscaling:DescribeLaunchConfigurations",
"autoscaling:DescribeTags" "autoscaling:DescribeTags",
"ec2:DescribeLaunchTemplateVersions"
], ],
"Resource": [ "Resource": [
"*" "*"

3
tests/integration/update_cluster/additional_cidr/cloudformation.json
View File

@ -691,7 +691,8 @@
"autoscaling:DescribeTags", "autoscaling:DescribeTags",
"autoscaling:SetDesiredCapacity", "autoscaling:SetDesiredCapacity",
"autoscaling:TerminateInstanceInAutoScalingGroup", "autoscaling:TerminateInstanceInAutoScalingGroup",
"autoscaling:UpdateAutoScalingGroup" "autoscaling:UpdateAutoScalingGroup",
"ec2:DescribeLaunchTemplateVersions"
], ],
"Effect": "Allow", "Effect": "Allow",
"Resource": [ "Resource": [

3
tests/integration/update_cluster/additional_user-data/cloudformation.json
View File

@ -664,7 +664,8 @@
"autoscaling:DescribeTags", "autoscaling:DescribeTags",
"autoscaling:SetDesiredCapacity", "autoscaling:SetDesiredCapacity",
"autoscaling:TerminateInstanceInAutoScalingGroup", "autoscaling:TerminateInstanceInAutoScalingGroup",
"autoscaling:UpdateAutoScalingGroup" "autoscaling:UpdateAutoScalingGroup",
"ec2:DescribeLaunchTemplateVersions"
], ],
"Effect": "Allow", "Effect": "Allow",
"Resource": [ "Resource": [

3
tests/integration/update_cluster/externallb/cloudformation.json
View File

@ -648,7 +648,8 @@
"autoscaling:DescribeTags", "autoscaling:DescribeTags",
"autoscaling:SetDesiredCapacity", "autoscaling:SetDesiredCapacity",
"autoscaling:TerminateInstanceInAutoScalingGroup", "autoscaling:TerminateInstanceInAutoScalingGroup",
"autoscaling:UpdateAutoScalingGroup" "autoscaling:UpdateAutoScalingGroup",
"ec2:DescribeLaunchTemplateVersions"
], ],
"Effect": "Allow", "Effect": "Allow",
"Resource": [ "Resource": [

3
tests/integration/update_cluster/minimal-cloudformation/cloudformation.json
View File

@ -639,7 +639,8 @@
"autoscaling:DescribeTags", "autoscaling:DescribeTags",
"autoscaling:SetDesiredCapacity", "autoscaling:SetDesiredCapacity",
"autoscaling:TerminateInstanceInAutoScalingGroup", "autoscaling:TerminateInstanceInAutoScalingGroup",
"autoscaling:UpdateAutoScalingGroup" "autoscaling:UpdateAutoScalingGroup",
"ec2:DescribeLaunchTemplateVersions"
], ],
"Effect": "Allow", "Effect": "Allow",
"Resource": [ "Resource": [