Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow cluster autoscaler to read EC2 instance types to build catalog dynamically #13532

Merged
merged 1 commit into from Apr 20, 2022
Merged

Allow cluster autoscaler to read EC2 instance types to build catalog dynamically #13532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions pkg/model/components/addonmanifests/clusterautoscaler/iam.go
View file
Open in desktop
Expand Up @@ -19,9 +19,10 @@ package clusterautoscaler
import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/kops/pkg/model/iam"
"k8s.io/kops/upup/pkg/fi"
)

// ServiceAccount represents the service-account used by the dns-controller.
// ServiceAccount represents the service account used by the cluster autoscaler.
// It implements iam.Subject to get AWS IAM permissions.
type ServiceAccount struct{}

Expand All @@ -32,7 +33,11 @@ func (r *ServiceAccount) BuildAWSPolicy(b *iam.PolicyBuilder) (*iam.Policy, erro
clusterName := b.Cluster.ObjectMeta.Name
p := iam.NewPolicy(clusterName, b.Partition)

iam.AddClusterAutoscalerPermissions(p)
var useStaticInstanceList bool
if ca := b.Cluster.Spec.ClusterAutoscaler; ca != nil && fi.BoolValue(ca.AWSUseStaticInstanceList) {
useStaticInstanceList = true
}
iam.AddClusterAutoscalerPermissions(p, useStaticInstanceList)

return p, nil
}
Expand Down
14 changes: 12 additions & 2 deletions pkg/model/iam/iam_builder.go
View file
Open in desktop
Expand Up @@ -427,7 +427,12 @@ func (r *NodeRoleMaster) BuildAWSPolicy(b *PolicyBuilder) (*Policy, error) {
if b.Cluster.Spec.AWSLoadBalancerController != nil && fi.BoolValue(b.Cluster.Spec.AWSLoadBalancerController.Enabled) {
AddAWSLoadbalancerControllerPermissions(p)
}
AddClusterAutoscalerPermissions(p)

var useStaticInstanceList bool
if ca := b.Cluster.Spec.ClusterAutoscaler; ca != nil && fi.BoolValue(ca.AWSUseStaticInstanceList) {
useStaticInstanceList = true
}
AddClusterAutoscalerPermissions(p, useStaticInstanceList)

nth := b.Cluster.Spec.NodeTerminationHandler
if nth != nil && fi.BoolValue(nth.Enabled) && fi.BoolValue(nth.EnableSQSTerminationDraining) {
Expand Down Expand Up @@ -1013,7 +1018,7 @@ func AddAWSLoadbalancerControllerPermissions(p *Policy) {
)
}

func AddClusterAutoscalerPermissions(p *Policy) {
func AddClusterAutoscalerPermissions(p *Policy, useStaticInstanceList bool) {
p.clusterTaggedAction.Insert(
"autoscaling:SetDesiredCapacity",
"autoscaling:TerminateInstanceInAutoScalingGroup",
Expand All @@ -1024,6 +1029,11 @@ func AddClusterAutoscalerPermissions(p *Policy) {
"autoscaling:DescribeLaunchConfigurations",
"ec2:DescribeLaunchTemplateVersions",
)
if !useStaticInstanceList {
p.unconditionalAction.Insert(
"ec2:DescribeInstanceTypes",
)
}
}

// AddAWSEBSCSIDriverPermissions appens policy statements that the AWS EBS CSI Driver needs to operate.
Expand Down
1 change: 1 addition & 0 deletions ...rsa/data/aws_iam_role_policy_cluster-autoscaler.kube-system.sa.minimal.example.com_policy
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@
"autoscaling:DescribeAutoScalingGroups",
"autoscaling:DescribeAutoScalingInstances",
"autoscaling:DescribeLaunchConfigurations",
"ec2:DescribeInstanceTypes",
"ec2:DescribeLaunchTemplateVersions"
],
"Effect": "Allow",
Expand Down
1 change: 1 addition & 0 deletions ...a23/data/aws_iam_role_policy_cluster-autoscaler.kube-system.sa.minimal.example.com_policy
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@
"autoscaling:DescribeAutoScalingGroups",
"autoscaling:DescribeAutoScalingInstances",
"autoscaling:DescribeLaunchConfigurations",
"ec2:DescribeInstanceTypes",
"ec2:DescribeLaunchTemplateVersions"
],
"Effect": "Allow",
Expand Down