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

Fix supporting secret-based and pre-shared certs at the same time #687

Merged
merged 1 commit into from
Mar 15, 2019
Merged

Fix supporting secret-based and pre-shared certs at the same time #687

merged 1 commit into from
Mar 15, 2019

Conversation

michallowicki
Copy link
Contributor

@michallowicki michallowicki commented Mar 14, 2019 •
edited by rramkumar1
Loading

Secret-based certs were skipped during loadbalancer runtime info update when pre-shared certs were specified.

Changed to always include secret-based certs and added a test to document this change.

This is a followup to #641

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

Hi @michallowicki. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 14, 2019
@michallowicki
Copy link
Contributor Author

/assign @rramkumar1

rramkumar1
rramkumar1 reviewed Mar 14, 2019
View reviewed changes
pkg/controller/controller_test.go Outdated
tlsCerts := []*loadbalancers.TLSCerts{&loadbalancers.TLSCerts{Key: "key", Cert: "cert", Name: "tlsCert"}}
fakeLoader := &tls.FakeTLSSecretLoader{FakeCerts: map[string]*loadbalancers.TLSCerts{"tlsCert": tlsCerts[0]}}
lbc.tlsLoader = fakeLoader
tlsName := "preSharedCert"
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: call this presharedCertName

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

rramkumar1
rramkumar1 reviewed Mar 14, 2019
View reviewed changes
pkg/controller/controller.go Outdated
@@ -556,19 +556,16 @@ func (lbc *LoadBalancerController) toRuntimeInfo(ing *extensions.Ingress, urlMap
var tls []*loadbalancers.TLSCerts

annotations := annotations.FromIngress(ing)
// Load the TLS cert from the API Spec if it is not specified in the annotation.
// TODO: enforce this with validation.
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove this TODO. I don't think its relevant anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@rramkumar1
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. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 14, 2019
@rramkumar1
Copy link
Contributor

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 15, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: michallowicki, rramkumar1

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 Mar 15, 2019
@rramkumar1 rramkumar1 merged commit 1f98d37 into kubernetes:release-1.5 Mar 15, 2019
@rramkumar1 rramkumar1 mentioned this pull request Mar 15, 2019
Merged
k8s-ci-robot added a commit that referenced this pull request Mar 15, 2019
@k8s-ci-robot
Merge pull request #690 from rramkumar1/managed-certs-cherry-pick
df5e594 
Add #687 onto master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rramkumar1 rramkumar1 rramkumar1 left review comments

@bowei bowei Awaiting requested review from bowei

@thockin thockin Awaiting requested review from thockin

Assignees

@rramkumar1 rramkumar1

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

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