Skip to content

Add support for creating access entries of type EC2 for EKS Auto Mode #8228

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

Merged
bryantbiggs merged 1 commit into from
Feb 20, 2025
+15 −1
Merged

Add support for creating access entries of type EC2 for EKS Auto Mode #8228

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/apis/eksctl.io/v1alpha5/access_entry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ type AccessScope struct {
type AccessEntryType string

const (
// AccessEntryTypeEc2 specifies the EC2 (Auto Mode) access entry type.
AccessEntryTypeEC2 AccessEntryType = "EC2"
// AccessEntryTypeLinux specifies the EC2 Linux access entry type.
AccessEntryTypeLinux AccessEntryType = "EC2_LINUX"
// AccessEntryTypeWindows specifies the Windows access entry type.
Expand Down Expand Up @@ -145,7 +147,7 @@ func validateAccessEntries(accessEntries []AccessEntry) error {
}

switch AccessEntryType(ae.Type) {
case "", AccessEntryTypeStandard:
case "", AccessEntryTypeStandard, AccessEntryTypeEC2:
case AccessEntryTypeLinux, AccessEntryTypeWindows, AccessEntryTypeFargateLinux, AccessEntryTypeHybridLinux:
if len(ae.KubernetesGroups) > 0 || ae.KubernetesUsername != "" {
return fmt.Errorf("cannot specify %s.kubernetesGroups nor %s.kubernetesUsername when type is set to %s", path, path, ae.Type)
Expand Down
12 changes: 12 additions & 0 deletions pkg/apis/eksctl.io/v1alpha5/access_entry_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,18 @@ var _ = DescribeTable("Access Entry validation", func(aet accessEntryTest) {
},
},
},
{
PrincipalARN: api.MustParseARN("arn:aws:iam::111122223333:role/role-7"),
Type: "EC2",
AccessPolicies: []api.AccessPolicy{
{
PolicyARN: api.MustParseARN("arn:aws:eks::aws:cluster-access-policy/AmazonEKSAutoNodePolicy"),
AccessScope: api.AccessScope{
Type: ekstypes.AccessScopeTypeCluster,
},
},
},
},
},
}),
)