-
Notifications
You must be signed in to change notification settings - Fork 299
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
Fix ILB forwarding rule bug #906
Merged
k8s-ci-robot
merged 1 commit into
kubernetes:master
from
spencerhance:ilb-forwarding-rule-custom-mode-network
Oct 22, 2019
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,6 +18,8 @@ package loadbalancers | |
|
||
import ( | ||
"fmt" | ||
"k8s.io/ingress-gce/pkg/flags" | ||
"k8s.io/ingress-gce/pkg/loadbalancers/features" | ||
|
||
"k8s.io/ingress-gce/pkg/composite" | ||
"k8s.io/ingress-gce/pkg/utils" | ||
|
@@ -91,9 +93,17 @@ func (l *L7) checkForwardingRule(name, proxyLink, ip, portRange string) (fw *com | |
} | ||
|
||
// Update rule for L7-ILB | ||
if utils.IsGCEL7ILBIngress(l.runtimeInfo.Ingress) { | ||
if flags.F.EnableL7Ilb && utils.IsGCEL7ILBIngress(l.runtimeInfo.Ingress) { | ||
rule.LoadBalancingScheme = "INTERNAL_MANAGED" | ||
|
||
// Custom mode networks require adding the cluster subnetwork | ||
if isCustomMode, err := features.IsCustomModeNetwork(l.cloud, l.cloud.NetworkURL()); err != nil { | ||
return nil, err | ||
} else if isCustomMode { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. if you are returning, you don't need the else |
||
rule.Subnetwork = l.cloud.SubnetworkURL() | ||
} | ||
} | ||
|
||
if err = composite.CreateForwardingRule(l.cloud, key, rule); err != nil { | ||
return nil, err | ||
} | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we might want to cache this at some point to avoid doing too many GCE calls
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good call. Originally this was thought to be the proxy subnet which would change, but now that it's the cluster subnet, we do only need to do it once.