feat: add new ECR endpoints to EKS ECR credential provider config (#2082

)
awslabs · Dec 16, 2024 · 131c287 · 131c287
1 parent 23f1c41
commit 131c287
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git 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/...st/e2e/cases/image-credential-provider/expected-image-credential-provider-config-126.json b/...st/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/...st/e2e/cases/image-credential-provider/expected-image-credential-provider-config-127.json b/...st/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",

diff --git 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",