feat(nodeadm): use ecr-credential-provider for public.ecr.aws in 1.27+ #2153
+37
−26
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ndbaker1
reviewed
Feb 14, 2025
Comment on lines
+1
to
+4
| { | ||
| "apiVersion": "{{.ConfigApiVersion}}", | ||
| "kind": "CredentialProviderConfig", | ||
| "providers": [ |
There was a problem hiding this comment.
thoughts on just using the go type for CredentialProviderConfig and serializing it to json?
| @@ -74,6 +88,8 @@ func generateImageCredentialProviderConfig(cfg *api.NodeConfig, ecrCredentialPro | |||
| } else { | |||
| templateVars.ConfigApiVersion = "kubelet.config.k8s.io/v1" | |||
| templateVars.ProviderApiVersion = "credentialprovider.kubelet.k8s.io/v1" | |||
| // ecr-credential-provider has support for public.ecr.aws in 1.27+ | |||
| templateVars.MatchImages = append(templateVars.MatchImages, "public.ecr.aws") | |||
There was a problem hiding this comment.
ignore me -- I breezed past this part.
Nick's suggestion to use a go type is probably reasonable given how clunky loops are in a go template. Looks like the versions we need are still available in the latest k/k: k8s.io/kubelet/config/v1alpha1, etc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
Description of changes:
Ports 78f54f6 to nodeadm/al2023
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Testing Done
Built a 1.30 AMI, checked the config file had
public.ecr.awsin the machImages list and that running a pod using an image from public ECR (public.ecr.aws/nginx/nginx:latest) does not fail when using a role withoutecr-publicpermissions.See this guide for recommended testing for PRs. Some tests may not apply. Completing tests and providing additional validation steps are not required, but it is recommended and may reduce review time and time to merge.