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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore default certificate during server initialization #4563

Closed
wants to merge 1 commit into from
Closed

Ignore default certificate during server initialization #4563

wants to merge 1 commit into from

Conversation

zeeZ
Copy link
Contributor

@zeeZ zeeZ commented Sep 15, 2019

What this PR does / why we need it: Recreation of #2279. When the oldest Ingress for a domain contains a TLS section, but no secret, the default certificate will always be used, even though a newer Ingress may contain a valid secret.

This PR tries to change the behavior from ignoring all further certificates if any certificate is present to ignoring all further certificates if any non-default certificate is present

Special notes for your reviewer: See the old PR for examples

@k8s-ci-robot k8s-ci-robot added 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. labels Sep 15, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @zeeZ. 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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 15, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: zeeZ
To complete the pull request process, please assign bowei
You can assign the PR to them by writing /assign @bowei in a comment when ready.

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

@aledbf
Copy link
Member

aledbf commented Sep 15, 2019

@zeeZ please add e2e tests

aledbf
aledbf reviewed Sep 15, 2019
View reviewed changes
internal/ingress/controller/controller.go
// only add a certificate if the server does not have one previously configured
if servers[host].SSLCert != nil {
// only add a certificate if the server does not have one previously configured that is not the default
if servers[host].SSLCert != nil && servers[host].SSLCert.PemFileName != n.cfg.DefaultSSLCertificate && servers[host].SSLCert != n.cfg.FakeCertificate {
Copy link
Member

Choose a reason for hiding this comment

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

@zeeZ I think this is not required. Since I removed the static SSL mode in #4356 the SSLCert is configured only when the ingress has a valid TLS section, it never contains the default or fake SSL certificate

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just checked against the current master and you're absolutely correct, the behavior changed since the last release!

@zeeZ
Copy link
Contributor Author

zeeZ commented Sep 15, 2019

This pull request's desired behavior is in master, so I'm closing this.

I might tackle those e2e tests when I have more time to figure them out in the future-

@zeeZ zeeZ closed this Sep 15, 2019
@zeeZ zeeZ mentioned this pull request Jan 14, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aledbf aledbf aledbf left review comments

@ElvinEfendi ElvinEfendi Awaiting requested review from ElvinEfendi

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zeeZ @k8s-ci-robot @aledbf