NE-167: Implement internal load-balancer API #254
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
size/XXL
Miciah
force-pushed
the
NE-167-implement-internal-load-balancer-API
branch
from
fa3622f to
f46c618
Compare
Contributor
Author
|
|
ironcladlou
reviewed
Jun 18, 2019
ironcladlou
reviewed
Jun 18, 2019
ironcladlou
reviewed
Jun 18, 2019
ironcladlou
reviewed
Jun 18, 2019
ironcladlou
reviewed
Jun 18, 2019
Miciah
force-pushed
the
NE-167-implement-internal-load-balancer-API
branch
2 times, most recently
from
9934e84 to
46e3577
Compare
Bump to github.com/openshift/api@2024105dd4c3cc30148d4127545eec7b21a53b65 to get the load-balancer scope API.
Respect the "scope" parameter for the ingress controller's load balancer strategy in order to allow choosing between an external (the default) or an internal load balancer. This commit resolves NE-167. https://jira.coreos.com/browse/NE-167 * pkg/operator/controller/controller.go (enforceEffectiveEndpointPublishingStrategy): Default status.endpointPublishingStrategy.loadBalancer.scope to "External". * pkg/operator/controller/controller_lb.go (internalLBAnnotations): New variable. Map platform type to the annotation for that platform that makes the load balancer internal-only. (desiredLoadBalancerService): Check status.endpointPublishingStrategy.loadBalancer.scope and use internalLBAnnotations to set the appropriate annotation if the scope is not "External". * pkg/operator/controller/dns/controller.go (Reconcile): Omit the public zone if the load balancer is internal-only. * test/e2e/operator_test.go (TestInternalLoadBalancer): New test.
Miciah
force-pushed
the
NE-167-implement-internal-load-balancer-API
branch
from
46e3577 to
8cd622f
Compare
Contributor
Author
|
Rebased. |
Contributor
Author
|
Timeouts from openshift-sdn and openshift-marketplace health probes and from etcd. /test e2e-aws-upgrade |
ironcladlou
approved these changes
Jun 19, 2019
| t.Skip("test skipped on \"none\" platform type") | ||
| case configv1.VSpherePlatformType: | ||
| t.Skip("test skipped on vSphere") | ||
| } |
Contributor
There was a problem hiding this comment.
TODO: Seems like it could be condensed to a lookup from internalLBAnnotations (if that were exposed by the package)
Contributor
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ironcladlou, Miciah The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR depends on #251.Bump
openshift/apiBump to github.com/openshift/api@2024105dd4c3cc30148d4127545eec7b21a53b65 to get the load-balancer scope API.
Honor the load balancer strategy's scope parameter
Respect the "scope" parameter for the ingress controller's load balancer strategy in order to allow choosing between an external (the default) or an internal load balancer.
pkg/operator/controller/controller.go(enforceEffectiveEndpointPublishingStrategy): Defaultstatus.endpointPublishingStrategy.loadBalancer.scopeto "External".pkg/operator/controller/controller_lb.go(internalLBAnnotations): New variable. Map platform type to the annotation for that platform that makes the load balancer internal-only.(
desiredLoadBalancerService): Checkstatus.endpointPublishingStrategy.loadBalancer.scopeand useinternalLBAnnotationsto set the appropriate annotation if the scope is not "External".pkg/operator/controller/dns/controller.go(Reconcile): Omit the public zone if the load balancer is internal-only.test/e2e/operator_test.go(TestInternalLoadBalancer): New test.