Skip to content

feat(eks): added support for bootstrapSelfManagedAddons #33597

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
merged 27 commits into from
Jun 6, 2025
Merged

feat(eks): added support for bootstrapSelfManagedAddons #33597

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0bd7c41
add prop bootstrapSelfManagedAddons
mrlikl Feb 26, 2025
f316fcf
bool typecheck
mrlikl Feb 26, 2025
0900af8
add readme
mrlikl Feb 26, 2025
c22e045
unit test
mrlikl Feb 26, 2025
96a8c5a
remove space
mrlikl Feb 26, 2025
c9cf43a
update integ tests
mrlikl Feb 27, 2025
1dfebbc
update k8s version in integ test
mrlikl Feb 27, 2025
1a6916f
fix integ tests and update k8s versions
mrlikl Feb 27, 2025
fc85216
Revert "fix integ tests and update k8s versions"
mrlikl Jun 2, 2025
654a138
Revert "update k8s version in integ test"
mrlikl Jun 2, 2025
dbc1fbe
Revert "update integ tests"
mrlikl Jun 2, 2025
82977bc
Merge branch 'main' into eks-bootstrap
mrlikl Jun 2, 2025
921f8c4
integ tests
mrlikl Jun 4, 2025
79be245
fix unit tests
mrlikl Jun 4, 2025
49d7461
Revert "fix unit tests"
mrlikl Jun 4, 2025
3246827
fix unit tests
mrlikl Jun 4, 2025
8b4dfa4
fix cluster handler and add integ test
mrlikl Jun 5, 2025
55f354d
lint fix
mrlikl Jun 6, 2025
021c5a3
dry run eks-addon integ test
mrlikl Jun 6, 2025
1158858
fix integ test
mrlikl Jun 6, 2025
01d3a46
Merge main into eks-bootstrap
mrlikl Jun 6, 2025
e7e2c36
removed extra space
mrlikl Jun 6, 2025
4ec8832
Revert "removed extra space"
mrlikl Jun 6, 2025
9cf1cc2
Remove compiled JS files from tracking
mrlikl Jun 6, 2025
8be2e02
pr review changes
mrlikl Jun 6, 2025
689353d
revert changes in s3-dep
mrlikl Jun 6, 2025
7fc8778
Merge branch 'main' into eks-bootstrap
mergify[bot] Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 1 addition & 3 deletions ...ages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ-tests-kubernetes-version.ts
View file
Open in desktop
Copy link
Member

@Abogical Abogical May 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes to this file are no longer needed due to the following commit: test(eks): remove eks.KubernetesVersion.V1_24 as default version in i…

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as lambda from 'aws-cdk-lib/aws-lambda';
import { KubectlV24Layer } from '@aws-cdk/lambda-layer-kubectl-v24';
import { KubectlV29Layer } from '@aws-cdk/lambda-layer-kubectl-v29';
import { KubectlV30Layer } from '@aws-cdk/lambda-layer-kubectl-v30';
import { KubectlV31Layer } from '@aws-cdk/lambda-layer-kubectl-v31';
Expand All @@ -12,15 +11,14 @@ import * as eks from 'aws-cdk-lib/aws-eks';
// create the appropriate KubectlLayerVersion instance based on the
// Kubernetes version.
const versionMap: { [key: string]: new (scope: Construct, id: string) => lambda.ILayerVersion } = {
'1.24': KubectlV24Layer,
'1.29': KubectlV29Layer,
'1.30': KubectlV30Layer,
'1.31': KubectlV31Layer,
'1.32': KubectlV32Layer,
};

export function getClusterVersionConfig(scope: Construct, version?: eks.KubernetesVersion) {
const _version = version ?? eks.KubernetesVersion.V1_24;
const _version = version ?? eks.KubernetesVersion.V1_29;
return {
version: _version,
// Crazy type-casting is required because KubectlLayer peer depends on
Expand Down
Binary file modified ...pi.js.snapshot/asset.0afbe25a9ce0197a83dffd77a86c1560704da246373a4ccafde5476e7e3d0811.zip
View file
Open in desktop
Binary file not shown.
88 changes: 41 additions & 47 deletions ...b49d9bb7403340990da8b466445db001/index.js → ...2ccaaa4983e22796e95e8351fe736f80/index.js
View file
Open in desktop

Large diffs are not rendered by default.

57 changes: 0 additions & 57 deletions ....snapshot/asset.818f9976c0b6e85dd2696d24402c2a177fb2c520d779e1925160a62523c4f20a/index.js
View file
Open in desktop

This file was deleted.

Binary file modified ...pi.js.snapshot/asset.93d96d34e0d3cd20eb082652b91012b131bdc34fcf2bc16eb4170e04772fddb1.zip
View file
Open in desktop
Binary file not shown.
0 ...13f22b10146f647b3f6bce4/apply/__init__.py → ...1b121e36664078b4ef4a11b/apply/__init__.py
View file
Open in desktop
File renamed without changes.
0 ...f913f22b10146f647b3f6bce4/get/__init__.py → ...331b121e36664078b4ef4a11b/get/__init__.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...913f22b10146f647b3f6bce4/helm/__init__.py → ...31b121e36664078b4ef4a11b/helm/__init__.py
View file
Open in desktop

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

0 ...e237162f913f22b10146f647b3f6bce4/index.py → ...f417342331b121e36664078b4ef4a11b/index.py
View file
Open in desktop
File renamed without changes.
0 ...13f22b10146f647b3f6bce4/patch/__init__.py → ...1b121e36664078b4ef4a11b/patch/__init__.py
View file
Open in desktop
File renamed without changes.
Binary file modified ...pi.js.snapshot/asset.e42a736be21cd3134b9bff4e71e3afa99a4cc900ae489e9a7f7025c8d258f9b8.zip
View file
Open in desktop
Binary file not shown.
24 changes: 12 additions & 12 deletions ...eg/test/aws-eks/test/integ.alb-controller-authapi.js.snapshot/integ-eks-stack.assets.json
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions .../test/aws-eks/test/integ.alb-controller-authapi.js.snapshot/integ-eks-stack.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@
"Arn"
]
},
"AttributesRevision": 4
"AttributesRevision": 5
},
"DependsOn": [
"ClusterCreationRoleDefaultPolicyE8BDFC7B",
Expand Down Expand Up @@ -941,7 +941,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/324f142fed1348758abdb3b4214c052bf51ce92a2e538c5e3e5283889068fa0a.json"
"/9022748d1031d8c5661de5eb68ece7205323eb97b704bb9c1bf48d481b3f08f2.json"
]
]
}
Expand Down Expand Up @@ -991,7 +991,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/cd27a50e825b1358497ebb365d76cc8e1d324d349f000e4317e9e270f7478ed2.json"
"/e06833fcbfe16090a316b5e89751da24f68ef6a6b54b1bebd7287cfee6cfeb53.json"
]
]
}
Expand Down
4 changes: 2 additions & 2 deletions ...js.snapshot/integeksstackawscdkawseksClusterResourceProviderD385D88C.nested.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "572dd2416e786aa13287a5bcd2330ca9b49d9bb7403340990da8b466445db001.zip"
"S3Key": "4aa2054a2faf51ae8bb7f5eef6d64aee2ccaaa4983e22796e95e8351fe736f80.zip"
},
"Description": "onEvent handler for EKS cluster resource provider",
"Environment": {
Expand Down Expand Up @@ -123,7 +123,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "572dd2416e786aa13287a5bcd2330ca9b49d9bb7403340990da8b466445db001.zip"
"S3Key": "4aa2054a2faf51ae8bb7f5eef6d64aee2ccaaa4983e22796e95e8351fe736f80.zip"
},
"Description": "isComplete handler for EKS cluster resource provider",
"Environment": {
Expand Down
2 changes: 1 addition & 1 deletion ...authapi.js.snapshot/integeksstackawscdkawseksKubectlProvider0B11D13A.nested.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "fba306965da4b2680dd8b4e6916610efe237162f913f22b10146f647b3f6bce4.zip"
"S3Key": "96b83d7c7535f7e731e0679249de9470f417342331b121e36664078b4ef4a11b.zip"
},
"Description": "onEvent handler for EKS kubectl resource provider",
"Environment": {
Expand Down
2 changes: 1 addition & 1 deletion .../framework-integ/test/aws-eks/test/integ.alb-controller-authapi.js.snapshot/manifest.json
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions ...ting/framework-integ/test/aws-eks/test/integ.alb-controller-authapi.js.snapshot/tree.json
View file
Open in desktop

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

Binary file modified ...er.js.snapshot/asset.0afbe25a9ce0197a83dffd77a86c1560704da246373a4ccafde5476e7e3d0811.zip
View file
Open in desktop
Binary file not shown.
Loading