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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: allowed ACM cert discovery to filter on CA ARNs (#3565) #3567

Closed
wants to merge 1 commit into from
Closed

feat: allowed ACM cert discovery to filter on CA ARNs (#3565) #3567

wants to merge 1 commit into from

Conversation

the-technat
Copy link
Contributor

@the-technat the-technat commented Feb 9, 2024 •
edited
Loading

Issue

Resolves #3565

Description

This PR adds a new flag that is passed to the ACMCertDiscovery type in order to filter auto-discovered certificates for a list of CA ARNs. This is usefull in situations where one needs to switch PCA while ensuring the aws-load-balancer-controller should explicitly pick the new CA to allow the old one to be removed (which is not possible when certificates are in use).

Checklist

  • Added tests that cover your change (if possible) -> there's no mock for the AWS ACM api in the code right now
  • Added/modified documentation as required (such as the README.md, or the docs directory)
  • Manually tested
  • Made sure the title of the PR is a good description that can go into the release notes

BONUS POINTS checklist: complete for good vibes and maybe prizes?! 馃く

  • Backfilled missing tests for code in same general area 馃帀
  • Refactored something and made the world a better place 馃専

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 9, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @the-technat!

It looks like this is your first PR to kubernetes-sigs/aws-load-balancer-controller 馃帀. 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-sigs/aws-load-balancer-controller 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 Feb 9, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @the-technat. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 9, 2024
@mkilchhofer mkilchhofer mentioned this pull request Feb 9, 2024
Closed
@the-technat
Copy link
Contributor Author

the-technat commented Feb 19, 2024 •
edited
Loading

Any feedback / reviews on this?

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mkilchhofer, the-technat
Once this PR has been reviewed and has the lgtm label, please assign oliviassss for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

M00nF1sh
M00nF1sh reviewed Feb 22, 2024
View reviewed changes
pkg/ingress/cert_discovery.go Outdated
@@ -102,7 +106,10 @@ func (d *acmCertDiscovery) loadDomainsForAllCertificates(ctx context.Context) (m
if err != nil {
return nil, err
}
domainsByCertARN[certARN] = certDomains
if len(certDomains.List()) > 0 {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can directly use len(certDomains) which is more efficient than convert it into list.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx for the hint, I updated it

M00nF1sh
M00nF1sh reviewed Feb 22, 2024
View reviewed changes
pkg/ingress/cert_discovery.go Outdated
d.certDomainsCache.Set(certARN, domains, d.privateCertDomainsCacheTTL)

// check if cert is issued from an allowed CA
if len(d.allowedCAARNs) == 0 || slices.Contains(d.allowedCAARNs, *certDetail.CertificateAuthorityArn) {
Copy link
Collaborator

@M00nF1sh M00nF1sh Feb 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will certDetail.CertificateAuthorityArn guaranteed to be non-nil? let's use awssdk.StringValue(certDetail.CertificateAuthorityArn) to be safe(so even if it's nil, the logic still holds and won't panic)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx for the hint, I updated it

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 22, 2024
@the-technat
Copy link
Contributor Author

the-technat commented Feb 22, 2024 •
edited
Loading

@M00nF1sh, @mkilchhofer somehow I accidentially closed this PR and mixed up git. Please refer to #3591 for the new and updated PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@M00nF1sh M00nF1sh M00nF1sh left review comments

@mkilchhofer mkilchhofer mkilchhofer approved these changes

@johngmyers johngmyers Awaiting requested review from johngmyers

@kishorj kishorj Awaiting requested review from kishorj

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

CertDiscovery: Ability to restrict/filter available certs
4 participants
@the-technat @k8s-ci-robot @mkilchhofer @M00nF1sh