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

fix(eks): update private ecr repo url regex #31394

Merged
merged 7 commits into from
Sep 14, 2024
Merged

fix(eks): update private ecr repo url regex #31394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55b98f6
update ecr repo url regex
natekruse-aws Sep 10, 2024
2890b77
Merge branch 'main' into fix-ecr-repo-regex
natekruse-aws Sep 10, 2024
dba8037
Add unit test for private helm chart repo
natekruse-aws Sep 12, 2024
6b2d473
Merge branch 'main' into fix-ecr-repo-regex
natekruse-aws Sep 12, 2024
36162d5
remove unecessary import
natekruse-aws Sep 12, 2024
f57aad4
Merge branch 'main' into fix-ecr-repo-regex
mergify[bot] Sep 13, 2024
7336880
Merge branch 'main' into fix-ecr-repo-regex
mergify[bot] Sep 13, 2024
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
2 changes: 1 addition & 1 deletion packages/@aws-cdk/custom-resource-handlers/lib/aws-eks/kubectl-handler/helm/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def helm_handler(event, context):

def get_oci_cmd(repository, version):
# Generates OCI command based on pattern. Public ECR vs Private ECR are treated differently.
private_ecr_pattern = 'oci://(?P<registry>\d+\.dkr\.ecr\.(?P<region>[a-z0-9\-]+)\.amazonaws\.com(\.cn)?)*'
private_ecr_pattern = 'oci://(?P<registry>\d+\.dkr\.ecr\.(?P<region>[a-z0-9\-]+)\.(?P<domain>[a-z0-9\.-]+))*'
public_ecr_pattern = 'oci://(?P<registry>public\.ecr\.aws)*'

private_registry = re.match(private_ecr_pattern, repository).groupdict()
Expand Down
10 changes: 10 additions & 0 deletions packages/aws-cdk-lib/aws-eks/test/helm-chart.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,5 +272,15 @@ describe('helm chart', () => {
// THEN
Template.fromStack(stack).hasResourceProperties(eks.HelmChart.RESOURCE_TYPE, { SkipCrds: true });
});
test('should use private ecr repo when specified', () => {
// GIVEN
const { stack, cluster } = testFixtureCluster();

// WHEN
new eks.HelmChart(stack, 'MyPrivateChart', { cluster, chart: 'chart', repository: 'oci://012345678.dkr.ecr.us-east-1.amazonaws.com/private-repo' });

// THEN
Template.fromStack(stack).hasResourceProperties(eks.HelmChart.RESOURCE_TYPE, { Repository: 'oci://012345678.dkr.ecr.us-east-1.amazonaws.com/private-repo' });
});
});
});