Skip to content

Commit ea5e5d1

Browse files
authored
Update ECR patterns to include new AWS format (#1602)
* Update ECR patterns to include new AWS format
1 parent 47baa57 commit ea5e5d1

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

pkg/webhook/controlplane/ensurer.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,7 @@ func (e *ensurer) credentialProviderConfigFile() (*extensionsv1alpha1.File, erro
507507
"*.dkr.ecr.*.amazonaws.com",
508508
"*.dkr.ecr.*.amazonaws.com.cn",
509509
"*.dkr.ecr-fips.*.amazonaws.com",
510-
"*.dkr.ecr.us-iso-east-1.c2s.ic.gov",
511-
"*.dkr.ecr.us-isob-east-1.sc2s.sgov.gov",
510+
"*.dkr-ecr.*.on.aws",
512511
},
513512
DefaultCacheDuration: &metav1.Duration{Duration: cacheDuration},
514513
}

pkg/webhook/controlplane/ensurer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ do
419419
ip link set dev ${interface} mtu 1460
420420
done
421421
`
422-
ecrConfig = `{"kind":"CredentialProviderConfig","apiVersion":"kubelet.config.k8s.io/v1","providers":[{"name":"ecr-credential-provider","matchImages":["*.dkr.ecr.*.amazonaws.com","*.dkr.ecr.*.amazonaws.com.cn","*.dkr.ecr-fips.*.amazonaws.com","*.dkr.ecr.us-iso-east-1.c2s.ic.gov","*.dkr.ecr.us-isob-east-1.sc2s.sgov.gov"],"defaultCacheDuration":"1h0m0s","apiVersion":"credentialprovider.kubelet.k8s.io/v1"}]}`
422+
ecrConfig = `{"kind":"CredentialProviderConfig","apiVersion":"kubelet.config.k8s.io/v1","providers":[{"name":"ecr-credential-provider","matchImages":["*.dkr.ecr.*.amazonaws.com","*.dkr.ecr.*.amazonaws.com.cn","*.dkr.ecr-fips.*.amazonaws.com","*.dkr-ecr.*.on.aws"],"defaultCacheDuration":"1h0m0s","apiVersion":"credentialprovider.kubelet.k8s.io/v1"}]}`
423423
filePath = "/opt/bin/mtu-customizer.sh"
424424
)
425425

0 commit comments

Comments
 (0)