Firewall Sync: Allow entire nodeport range #122
Merged
Conversation
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
k8s-ci-robot
added
cncf-cla: yes
nicksardo
changed the title
bowei
reviewed
Feb 2, 2018
pkg/controller/cluster_manager.go
Outdated
| @@ -131,7 +131,7 @@ func (c *ClusterManager) Checkpoint(lbs []*loadbalancers.L7RuntimeInfo, nodeName | |||
| return igs, err | |||
| } | |||
|
|
|||
| if err := c.firewallPool.Sync(firewallPorts, nodeNames); err != nil { | |||
| if err := c.firewallPool.Sync(nodeNames); err != nil { | |||
There was a problem hiding this comment.
Should we keep the existing behavior but as optional if the range is not set?
There was a problem hiding this comment.
Actually on second thought, let's remove the old code -- it's a lot more complex.
There was a problem hiding this comment.
On second thought, we'll need to pass in the list of ports used for NEG and merge them with the node port range.
bowei
reviewed
Feb 2, 2018
pkg/firewalls/firewalls.go
Outdated
| for _, aAllow := range allowListA { | ||
| matchSet.Insert(firewallAllowedToString(aAllow)) | ||
| } | ||
|
|
There was a problem hiding this comment.
why not use sets for both and call the set Equal?
pkg/firewalls/firewalls.go
Outdated
|
|
||
| func firewallAllowedToString(allowed *compute.FirewallAllowed) string { | ||
| sort.Sort(sort.StringSlice(allowed.Ports)) | ||
| return strings.ToUpper(allowed.IPProtocol) + strings.Join(allowed.Ports, ",") |
There was a problem hiding this comment.
add a colon in the middle so if someone logs the result it looks ok to a human
return strings.ToUpper(allowed.IPProtocol) + ":" + strings.Join(allowed.Ports, ",")
bowei
reviewed
Feb 2, 2018
pkg/controller/cluster_manager.go
Outdated
| @@ -226,6 +227,6 @@ func NewClusterManager( | |||
|
|
|||
| // L7 pool creates targetHTTPProxy, ForwardingRules, UrlMaps, StaticIPs. | |||
| cluster.l7Pool = loadbalancers.NewLoadBalancerPool(cloud, defaultBackendPool, defaultBackendNodePort, cluster.ClusterNamer) | |||
| cluster.firewallPool = firewalls.NewFirewallPool(cloud, cluster.ClusterNamer) | |||
| cluster.firewallPool = firewalls.NewFirewallPool(cloud, cluster.ClusterNamer, gce.LoadBalancerSrcRanges(), nodePortRanges) | |||
There was a problem hiding this comment.
let's just access these as a global -- it is more like a constant than a parameter.
bowei
reviewed
Feb 2, 2018
pkg/firewalls/fakes.go
Outdated
| func copyFirewall(f *compute.Firewall) *compute.Firewall { | ||
| enc, err := f.MarshalJSON() | ||
| if err != nil { | ||
| panic(fmt.Sprintf("Failed to encode to json: %v", err)) |
bowei
reviewed
Feb 2, 2018
pkg/firewalls/firewalls.go
Outdated
| @@ -190,3 +160,35 @@ type FirewallSyncError struct { | |||
| func (f *FirewallSyncError) Error() string { | |||
| return f.Message | |||
| } | |||
|
|
|||
| func firewallsEqual(expected *compute.Firewall, existing *compute.Firewall) bool { | |||
There was a problem hiding this comment.
can just call this equal (firewalls.equal)
bowei
reviewed
Feb 2, 2018
pkg/firewalls/firewalls.go
Outdated
| return true | ||
| } | ||
|
|
||
| func firewallAllowedToString(allowed []*compute.FirewallAllowed) []string { |
There was a problem hiding this comment.
same, firewall prefix is not needed
bowei
reviewed
Feb 3, 2018
pkg/flags/flags.go
Outdated
| @@ -92,11 +103,41 @@ the pod secrets for creating a Kubernetes client.`) | |||
| `Print the version of the controller and exit`) | |||
| flag.StringVar(&F.IngressClass, "ingress-class", "", | |||
| `If set, overrides what ingress classes are managed by the controller.`) | |||
| flag.Var(&F.NodePortRanges, "node-port-ranges", `Node port/port-ranges whitelisted for the | |||
| L7 load balancing`) | |||
There was a problem hiding this comment.
might want to document the with an example
bowei
reviewed
Feb 3, 2018
pkg/firewalls/fakes.go
Outdated
| ff.fw[f.Name] = f | ||
| cf, err := copyFirewall(f) | ||
| if err != nil { | ||
| return fmt.Errorf("Failed to copy firewall: %v", err) |
pkg/firewalls/fakes.go
Outdated
| ff.fw[f.Name] = f | ||
| cf, err := copyFirewall(f) | ||
| if err != nil { | ||
| return fmt.Errorf("Failed to copy firewall: %v", err) |
nicksardo
force-pushed
the
firewall-broad
branch
from
24b9c63
to
93f9a0a
Compare
k8s-ci-robot
added
size/XL
nicksardo
force-pushed
the
firewall-broad
branch
from
84c306e
to
b43352e
Compare
|
I believe we have three options to handle NEG endpoints.
|
bowei
approved these changes
Feb 3, 2018
|
I need to update the static-ip E2E test. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes
gce.LoadBalancerSourceRanges()static func for specifying the GCE source ranges. This is definable via flag.