From 7c8cfa894a659d42c26aa1c012decbd7618f2967 Mon Sep 17 00:00:00 2001 From: Bartlomiej Dworak Date: Fri, 6 Dec 2024 11:41:59 -0800 Subject: [PATCH 1/2] Add new ECR endpoints to EKS ECR credential provider config json --- .../internal/kubelet/image-credential-provider.template.json | 3 +++ templates/al2/runtime/ecr-credential-provider-config.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/nodeadm/internal/kubelet/image-credential-provider.template.json b/nodeadm/internal/kubelet/image-credential-provider.template.json index 916e2c3d4..6edaf625e 100644 --- a/nodeadm/internal/kubelet/image-credential-provider.template.json +++ b/nodeadm/internal/kubelet/image-credential-provider.template.json @@ -6,8 +6,11 @@ "name": "{{.EcrProviderName}}", "matchImages": [ "*.dkr.ecr.*.amazonaws.com", + "*.dkr-ecr.*.on.aws", "*.dkr.ecr.*.amazonaws.com.cn", + "*.dkr-ecr.*.on.amazonwebservices.com.cn", "*.dkr.ecr-fips.*.amazonaws.com", + "*.dkr-ecr-fips.*.on.aws", "*.dkr.ecr.*.c2s.ic.gov", "*.dkr.ecr.*.sc2s.sgov.gov", "*.dkr.ecr.*.cloud.adc-e.uk", diff --git a/templates/al2/runtime/ecr-credential-provider-config.json b/templates/al2/runtime/ecr-credential-provider-config.json index 582c576da..d94665ea8 100644 --- a/templates/al2/runtime/ecr-credential-provider-config.json +++ b/templates/al2/runtime/ecr-credential-provider-config.json @@ -6,8 +6,11 @@ "name": "ecr-credential-provider", "matchImages": [ "*.dkr.ecr.*.amazonaws.com", + "*.dkr-ecr.*.on.aws", "*.dkr.ecr.*.amazonaws.com.cn", + "*.dkr-ecr.*.on.amazonwebservices.com.cn", "*.dkr.ecr-fips.*.amazonaws.com", + "*.dkr-ecr-fips.*.on.aws", "*.dkr.ecr.*.c2s.ic.gov", "*.dkr.ecr.*.sc2s.sgov.gov", "*.dkr.ecr.*.cloud.adc-e.uk", From 6b9f9a3b6912bc82537a68dad9d154a7c215eadc Mon Sep 17 00:00:00 2001 From: Bartlomiej Dworak Date: Fri, 6 Dec 2024 11:58:08 -0800 Subject: [PATCH 2/2] update unit tests for nodeadm image credential provider to match expected image credential provider config json --- .../expected-image-credential-provider-config-126.json | 3 +++ .../expected-image-credential-provider-config-127.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/nodeadm/test/e2e/cases/image-credential-provider/expected-image-credential-provider-config-126.json b/nodeadm/test/e2e/cases/image-credential-provider/expected-image-credential-provider-config-126.json index 8a60d283e..f42cf1479 100644 --- a/nodeadm/test/e2e/cases/image-credential-provider/expected-image-credential-provider-config-126.json +++ b/nodeadm/test/e2e/cases/image-credential-provider/expected-image-credential-provider-config-126.json @@ -6,8 +6,11 @@ "name": "ecr-credential-provider", "matchImages": [ "*.dkr.ecr.*.amazonaws.com", + "*.dkr-ecr.*.on.aws", "*.dkr.ecr.*.amazonaws.com.cn", + "*.dkr-ecr.*.on.amazonwebservices.com.cn", "*.dkr.ecr-fips.*.amazonaws.com", + "*.dkr-ecr-fips.*.on.aws", "*.dkr.ecr.*.c2s.ic.gov", "*.dkr.ecr.*.sc2s.sgov.gov", "*.dkr.ecr.*.cloud.adc-e.uk", diff --git a/nodeadm/test/e2e/cases/image-credential-provider/expected-image-credential-provider-config-127.json b/nodeadm/test/e2e/cases/image-credential-provider/expected-image-credential-provider-config-127.json index 582c576da..d94665ea8 100644 --- a/nodeadm/test/e2e/cases/image-credential-provider/expected-image-credential-provider-config-127.json +++ b/nodeadm/test/e2e/cases/image-credential-provider/expected-image-credential-provider-config-127.json @@ -6,8 +6,11 @@ "name": "ecr-credential-provider", "matchImages": [ "*.dkr.ecr.*.amazonaws.com", + "*.dkr-ecr.*.on.aws", "*.dkr.ecr.*.amazonaws.com.cn", + "*.dkr-ecr.*.on.amazonwebservices.com.cn", "*.dkr.ecr-fips.*.amazonaws.com", + "*.dkr-ecr-fips.*.on.aws", "*.dkr.ecr.*.c2s.ic.gov", "*.dkr.ecr.*.sc2s.sgov.gov", "*.dkr.ecr.*.cloud.adc-e.uk",