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

AWS: support mixed plaintext/encrypted ports in ELBs via service.beta.kubernetes.io/aws-load-balancer-ssl-ports annotation #26976

Merged
merged 1 commit into from
Jun 10, 2016

Conversation

therc
Copy link
Member

@therc therc commented Jun 7, 2016

Fixes #26268

Implements the second SSL ELB annotation, per #24978

service.beta.kubernetes.io/aws-load-balancer-ssl-ports=* (comma-separated list of port numbers or e.g. https)

If not specified, all ports are secure (SSL or HTTPS).

@justinsb justinsb self-assigned this Jun 7, 2016
@justinsb justinsb added this to the v1.3 milestone Jun 7, 2016
@justinsb justinsb added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Jun 7, 2016
@justinsb
Copy link
Member

justinsb commented Jun 7, 2016

Marking as P1 because without this you can't mix HTTP and HTTPS on a single service with Type=LoadBalancer with our new SSL support, which seems like a very common use-case

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Jun 7, 2016
@therc
Copy link
Member Author

therc commented Jun 7, 2016

@k8s-bot test this issue: #26431

1 similar comment
@therc
Copy link
Member Author

therc commented Jun 7, 2016

@k8s-bot test this issue: #26431

Fixes kubernetes#26268

Implements the second SSL ELB annotation, per kubernetes#24978

service.beta.kubernetes.io/aws-load-balancer-ssl-ports=* (or e.g. https)

If not specified, all ports are secure (SSL or HTTPS).
@k8s-bot
Copy link

k8s-bot commented Jun 8, 2016

GCE e2e build/test passed for commit 4ff9e93.

// getPortSets returns a portSets structure representing port names and numbers
// that the comma-separated string describes. If the input is empty or equal to
// "*", a nil pointer is returned.
func getPortSets(annotation string) (ports *portSets) {
Copy link
Member

Choose a reason for hiding this comment

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

Nit: we tend to avoid the named-retval style. But I'm just repeating what I've been told!

@justinsb
Copy link
Member

justinsb commented Jun 9, 2016

Some style nits, but nothing we can't fix later (mostly just "for next time" type things)

Marking LGTM - thanks for this!

@justinsb justinsb added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 9, 2016
@justinsb justinsb changed the title AWS: support mixed plaintext/encrypted ports in ELBs AWS: support mixed plaintext/encrypted ports in ELBs via service.beta.kubernetes.io/aws-load-balancer-ssl-ports annotation Jun 9, 2016
@justinsb justinsb added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Jun 9, 2016
@justinsb
Copy link
Member

justinsb commented Jun 9, 2016

(Not sure about whether that release-note name is going to be too long...)

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Jun 10, 2016

GCE e2e build/test passed for commit 4ff9e93.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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.

5 participants