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.

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

Update ECR Regex to support new dual stack endpoints + tests #1069

Merged
merged 1 commit into from
Dec 9, 2024

Conversation

BDworak
Copy link
Contributor

@BDworak BDworak commented Dec 6, 2024

What type of PR is this?
/kind feature

What this PR does / why we need it:
This PR modifies the ECR Registry Regex to add support to new up and coming ECR Dual Stack endpoints. These endpoints are in the format:

<account_id>.dkr-ecr.<region>.on.aws
<account_id>.dkr-ecr.<region>.on.amazonwebservices.com.cn
<account_id>.dkr-ecr-fips.<region>.on.aws

This PR also cleans up the parseRegionFromECRPrivateHost function to expect 5 capture groups from the ecrPrivateHostPattern regex that would be of interest within the code.
Example input: 123456789123.dkr-ecr-fips.us-west-2.on.aws
Captures:

  • 0 -123456789123.dkr-ecr-fips.us-west-2.on.aws (Entire match)
  • 1 - 123456789123 (Account ID)
  • 2 - -fips (Fips endpoint)
  • 3 - us-west-2 (region)
  • 4 - on.aws (Domain)

Testing was added for the parseRegionFromECRPrivateHost method to account for all possible combinations of ECR FQDN ensuring accurate parsing of the regex.

Special notes for your reviewer:
CR for support in EKS AMI pending merge - awslabs/amazon-eks-ami#2082

Does this PR introduce a user-facing change?:

NONE

 Add support for Dual Stack ECR endpoints in ecr-credential-provider

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. labels Dec 6, 2024
Copy link

linux-foundation-easycla bot commented Dec 6, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: BDworak / name: Bart Dworak (cef3b8f)

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Dec 6, 2024
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If cloud-provider-aws contributors determine this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot
Copy link
Contributor

Welcome @BDworak!

It looks like this is your first PR to kubernetes/cloud-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/cloud-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Dec 6, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @BDworak. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 6, 2024
@BDworak BDworak force-pushed the ecr-dual-stack-endpoints branch from 9dffb43 to de43309 Compare December 6, 2024 23:39
@cartermckinnon
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 7, 2024
@BDworak BDworak force-pushed the ecr-dual-stack-endpoints branch from 6f2cb1f to 10340d5 Compare December 7, 2024 23:28
…x to have 5 capture groups, elimiating un-needed captures, update tests for new endpoints and parseRegionFromECRPrivateHost to support multiple region combinations
@BDworak BDworak force-pushed the ecr-dual-stack-endpoints branch from 10340d5 to cef3b8f Compare December 8, 2024 00:10
@kmala
Copy link
Member

kmala commented Dec 9, 2024

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 9, 2024
@cartermckinnon
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cartermckinnon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2024
@k8s-ci-robot k8s-ci-robot merged commit bb9c305 into kubernetes:master Dec 9, 2024
11 checks passed
@BDworak BDworak deleted the ecr-dual-stack-endpoints branch December 9, 2024 20:04
k8s-ci-robot added a commit that referenced this pull request Dec 10, 2024
…upstream-release-1.30

Automated cherry pick of #1069: Update ECR Regex to support new dual stack endpoints, modify
k8s-ci-robot added a commit that referenced this pull request Dec 10, 2024
…upstream-release-1.28

Automated cherry pick of #1069: Update ECR Regex to support new dual stack endpoints, modify
k8s-ci-robot added a commit that referenced this pull request Dec 10, 2024
…upstream-release-1.29

Automated cherry pick of #1069: Update ECR Regex to support new dual stack endpoints, modify
k8s-ci-robot added a commit that referenced this pull request Dec 10, 2024
…upstream-release-1.31

Automated cherry pick of #1069: Update ECR Regex to support new dual stack endpoints, modify
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants