Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions pkg/apis/eksctl.io/v1alpha5/assets/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2434,6 +2434,9 @@
"description": "enables IAM policy for cluster-autoscaler",
"x-intellij-html-description": "enables IAM policy for cluster-autoscaler"
},
"awsGlobalAccelerator": {
"type": "boolean"
},
"awsLoadBalancerController": {
"type": "boolean"
},
Expand Down Expand Up @@ -2483,7 +2486,8 @@
"awsLoadBalancerController",
"albIngress",
"xRay",
"cloudWatch"
"cloudWatch",
"awsGlobalAccelerator"
],
"additionalProperties": false,
"description": "holds all IAM addon policies",
Expand Down Expand Up @@ -3152,6 +3156,12 @@
"x-intellij-html-description": "adds policies for cluster-autoscaler. See <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/cluster-autoscaler.html\">autoscaler AWS docs</a>.",
"default": "false"
},
"awsGlobalAccelerator": {
"type": "boolean",
"description": "adds policies for using the Amazon Global Accelerator. See [IAM Policy for AWS Global Accelerator Controller](https://kubernetes-sigs.github.io/aws-load-balancer-controller/latest/install/aga_controller_iam_policy/).",
"x-intellij-html-description": "adds policies for using the Amazon Global Accelerator. See <a href=\"https://kubernetes-sigs.github.io/aws-load-balancer-controller/latest/install/aga_controller_iam_policy/\">IAM Policy for AWS Global Accelerator Controller</a>.",
"default": "false"
},
"awsLoadBalancerController": {
"type": "boolean",
"description": "adds policies for using the aws-load-balancer-controller. See [Load Balancer docs](https://docs.aws.amazon.com/eks/latest/userguide/aws-load-balancer-controller.html).",
Expand Down Expand Up @@ -3196,7 +3206,8 @@
"externalDNS",
"certManager",
"ebsCSIController",
"efsCSIController"
"efsCSIController",
"awsGlobalAccelerator"
],
"additionalProperties": false,
"description": "for attaching common IAM policies",
Expand Down
4 changes: 4 additions & 0 deletions pkg/apis/eksctl.io/v1alpha5/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -1290,6 +1290,7 @@ func NewNodeGroup() *NodeGroup {
DeprecatedALBIngress: Disabled(),
XRay: Disabled(),
CloudWatch: Disabled(),
AWSGlobalAccelerator: Disabled(),
},
},
ScalingConfig: &ScalingConfig{},
Expand Down Expand Up @@ -1340,6 +1341,7 @@ func NewManagedNodeGroup() *ManagedNodeGroup {
DeprecatedALBIngress: Disabled(),
XRay: Disabled(),
CloudWatch: Disabled(),
AWSGlobalAccelerator: Disabled(),
},
},
ScalingConfig: &ScalingConfig{},
Expand Down Expand Up @@ -1565,6 +1567,8 @@ type (
XRay *bool `json:"xRay"`
// +optional
CloudWatch *bool `json:"cloudWatch"`
// +optional
AWSGlobalAccelerator *bool `json:"awsGlobalAccelerator"`
}

// NodeGroupSSH holds all the ssh access configuration to a NodeGroup
Expand Down
3 changes: 3 additions & 0 deletions pkg/apis/eksctl.io/v1alpha5/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -1215,6 +1215,9 @@ func validateNodeGroupIAMWithAddonPolicies(
if IsEnabled(policies.CloudWatch) {
return fmtFieldConflictErr(prefix + "cloudWatch")
}
if IsEnabled(policies.AWSGlobalAccelerator) {
return fmtFieldConflictErr(prefix + "awsGlobalAccelerator")
}
return nil
}

Expand Down
6 changes: 5 additions & 1 deletion pkg/apis/eksctl.io/v1alpha5/well_known_iam_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,14 @@ type WellKnownPolicies struct {
// efs-csi-controller. See [aws-efs-csi-driver
// docs](https://aws.amazon.com/blogs/containers/introducing-efs-csi-dynamic-provisioning).
EFSCSIController bool `json:"efsCSIController,inline"`
// AWSGlobalAccelerator adds policies for using the
// Amazon Global Accelerator. See [IAM Policy for
// AWS Global Accelerator Controller](https://kubernetes-sigs.github.io/aws-load-balancer-controller/latest/install/aga_controller_iam_policy/).
AWSGlobalAccelerator bool `json:"awsGlobalAccelerator,inline"`
}

func (p *WellKnownPolicies) HasPolicy() bool {
return p.ImageBuilder || p.AutoScaler || p.AWSLoadBalancerController || p.ExternalDNS || p.CertManager || p.EBSCSIController || p.EFSCSIController
return p.ImageBuilder || p.AutoScaler || p.AWSLoadBalancerController || p.ExternalDNS || p.CertManager || p.EBSCSIController || p.EFSCSIController || p.AWSGlobalAccelerator
}

func (p *WellKnownPolicies) String() string { return "" }
Expand Down
5 changes: 5 additions & 0 deletions pkg/apis/eksctl.io/v1alpha5/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/awsapi/autoscaling.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/awsapi/cloudwatchlogs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/awsapi/ec2.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/awsapi/eks.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions pkg/cfn/builder/iam_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ func createWellKnownPolicies(wellKnownPolicies api.WellKnownPolicies) ([]managed
customPolicyForRole{Name: "PolicyEFSCSIController", Statements: efsCSIControllerStatements()},
)
}
if wellKnownPolicies.AWSGlobalAccelerator {
customPolicies = append(customPolicies,
customPolicyForRole{Name: "PolicyAWSGlobalAccelerator", Statements: globalAcceleratorStatements()},
)
}
return managedPolicies, customPolicies
}

Expand Down Expand Up @@ -143,6 +148,10 @@ func createRole(cfnTemplate cfnTemplate, clusterIAMConfig *api.ClusterIAM, iamCo
cfnTemplate.attachAllowPolicy("PolicyXRay", refIR, xRayStatements())
}

if api.IsEnabled(iamConfig.WithAddonPolicies.AWSGlobalAccelerator) {
cfnTemplate.attachAllowPolicy("PolicyAWSGlobalAccelerator", refIR, globalAcceleratorStatements())
}

return nil
}

Expand Down
148 changes: 147 additions & 1 deletion pkg/cfn/builder/iam_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ var _ = Describe("template builder for IAM", func() {
ImageBuilder: true,
AutoScaler: true,
AWSLoadBalancerController: true,
AWSGlobalAccelerator: true,
ExternalDNS: true,
CertManager: true,
EBSCSIController: true,
Expand All @@ -319,7 +320,7 @@ var _ = Describe("template builder for IAM", func() {

Expect(t.Description).To(Equal("IAM role for serviceaccount \"default/sa-1\" [created and managed by eksctl]"))

Expect(t.Resources).To(HaveLen(9))
Expect(t.Resources).To(HaveLen(10))
Expect(t.Outputs).To(HaveLen(1))

Expect(t).To(HaveResource(outputs.IAMServiceAccountRoleName, "AWS::IAM::Role"))
Expand All @@ -335,6 +336,7 @@ var _ = Describe("template builder for IAM", func() {
]`))
Expect(t).To(HaveOutputWithValue(outputs.IAMServiceAccountRoleName, `{ "Fn::GetAtt": "Role1.Arn" }`))
Expect(t).To(HaveResourceWithPropertyValue("PolicyAWSLoadBalancerController", "PolicyDocument", expectedAWSLoadBalancerControllerPolicyDocument))
Expect(t).To(HaveResourceWithPropertyValue("PolicyAWSGlobalAccelerator", "PolicyDocument", expectedAWSGlobalAcceleratorPolicyDocument))
})

It("can parse an iamserviceaccount addon template", func() {
Expand Down Expand Up @@ -806,3 +808,147 @@ const expectedAWSLoadBalancerControllerPolicyDocument = `{
],
"Version": "2012-10-17"
}`

const expectedAWSGlobalAcceleratorPolicyDocument = `{
"Statement": [
{
"Effect": "Allow",
"Action": [
"iam:CreateServiceLinkedRole"
],
"Resource": "*",
"Condition": {
"StringEquals": {
"iam:AWSServiceName": [
"globalaccelerator.amazonaws.com"
]
}
}
},
{
"Effect": "Allow",
"Action": [
"globalaccelerator:ListAccelerators",
"globalaccelerator:ListEndpointGroups",
"globalaccelerator:ListListeners",
"globalaccelerator:ListTagsForResource",
"ec2:DescribeRegions",
"tag:GetResources"
],
"Resource": "*"
},
{
"Effect": "Allow",
"Action": [
"globalaccelerator:DescribeAccelerator",
"globalaccelerator:DescribeEndpointGroup",
"globalaccelerator:DescribeListener"
],
"Resource": [
{
"Fn::Sub": "arn:${AWS::Partition}:globalaccelerator::*:accelerator/*"
},
{
"Fn::Sub": "arn:${AWS::Partition}:globalaccelerator::*:accelerator/*/listener/*"
},
{
"Fn::Sub": "arn:${AWS::Partition}:globalaccelerator::*:accelerator/*/listener/*/endpoint-group/*"
}
],
"Condition": {
"Null": {
"aws:ResourceTag/elbv2.k8s.aws/cluster": "false"
},
"StringEquals": {
"aws:ResourceTag/aga.k8s.aws/resource": "GlobalAccelerator"
}
}
},
{
"Effect": "Allow",
"Action": [
"globalaccelerator:CreateAccelerator"
],
"Resource": "*",
"Condition": {
"Null": {
"aws:RequestTag/elbv2.k8s.aws/cluster": "false"
},
"StringEquals": {
"aws:RequestTag/aga.k8s.aws/resource": "GlobalAccelerator"
}
}
},
{
"Effect": "Allow",
"Action": [
"globalaccelerator:UpdateAccelerator",
"globalaccelerator:DeleteAccelerator",
"globalaccelerator:CreateListener",
"globalaccelerator:UpdateListener",
"globalaccelerator:DeleteListener",
"globalaccelerator:CreateEndpointGroup",
"globalaccelerator:UpdateEndpointGroup",
"globalaccelerator:DeleteEndpointGroup",
"globalaccelerator:AddEndpoints",
"globalaccelerator:RemoveEndpoints"
],
"Resource": [
{
"Fn::Sub": "arn:${AWS::Partition}:globalaccelerator::*:accelerator/*"
},
{
"Fn::Sub": "arn:${AWS::Partition}:globalaccelerator::*:accelerator/*/listener/*"
},
{
"Fn::Sub": "arn:${AWS::Partition}:globalaccelerator::*:accelerator/*/listener/*/endpoint-group/*"
}
],
"Condition": {
"Null": {
"aws:ResourceTag/elbv2.k8s.aws/cluster": "false"
},
"StringEquals": {
"aws:ResourceTag/aga.k8s.aws/resource": "GlobalAccelerator"
}
}
},
{
"Effect": "Allow",
"Action": [
"globalaccelerator:TagResource",
"globalaccelerator:UntagResource"
],
"Resource": {
"Fn::Sub": "arn:${AWS::Partition}:globalaccelerator::*:accelerator/*"
},
"Condition": {
"Null": {
"aws:RequestTag/elbv2.k8s.aws/cluster": "true",
"aws:ResourceTag/elbv2.k8s.aws/cluster": "false"
},
"StringEquals": {
"aws:ResourceTag/aga.k8s.aws/resource": "GlobalAccelerator"
}
}
},
{
"Effect": "Allow",
"Action": [
"globalaccelerator:TagResource"
],
"Resource": {
"Fn::Sub": "arn:${AWS::Partition}:globalaccelerator::*:accelerator/*"
},
"Condition": {
"Null": {
"aws:RequestTag/elbv2.k8s.aws/cluster": "false"
},
"StringEquals": {
"aws:RequestTag/aga.k8s.aws/resource": "GlobalAccelerator"
}
}
}
],
"Version": "2012-10-17"
}`
8 changes: 8 additions & 0 deletions pkg/cfn/builder/managed_nodegroup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ func TestManagedPolicyResources(t *testing.T) {
expectedManagedPolicies: makePartitionedPolicies("AmazonEKSWorkerNodePolicy", "AmazonEKS_CNI_Policy", "AmazonEC2ContainerRegistryPullOnly", "AmazonSSMManagedInstanceCore"),
description: "AutoScaler enabled",
},
{
addons: api.NodeGroupIAMAddonPolicies{
AWSGlobalAccelerator: api.Enabled(),
},
expectedNewPolicies: []string{"PolicyAWSGlobalAccelerator"},
expectedManagedPolicies: makePartitionedPolicies("AmazonEKSWorkerNodePolicy", "AmazonEKS_CNI_Policy", "AmazonEC2ContainerRegistryPullOnly", "AmazonSSMManagedInstanceCore"),
description: "AWSGlobalAccelerator enabled",
},
{
attachPolicy: cft.MakePolicyDocument(cft.MapOfInterfaces{
"Effect": "Allow",
Expand Down
Loading