Skip to content

Add NatFlags flag to OutboundNatPolicySetting #1013

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

Merged
dcantah merged 3 commits into from
Apr 30, 2021
Merged

Add NatFlags flag to OutboundNatPolicySetting #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3f1ab7
Add ipv6 flag to OutboundNatPolicySetting
vikas-bh Apr 29, 2021
f568d43
CR feedback
vikas-bh Apr 29, 2021
716eddc
CR feedback
vikas-bh Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hcn/hcnloadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ var (
LoadBalancerFlagsNone LoadBalancerFlags = 0
// LoadBalancerFlagsDSR enables Direct Server Return (DSR)
LoadBalancerFlagsDSR LoadBalancerFlags = 1
LoadBalancerFlagsIPv6 LoadBalancerFlags = 2
)
Copy link
Copy Markdown
Contributor

@dcantah dcantah Apr 29, 2021

Choose a reason for hiding this comment

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

Ideally these would be constants also, is there any reason they aren't?

Copy link
Copy Markdown
Contributor

@dcantah dcantah Apr 29, 2021

Choose a reason for hiding this comment

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

Then you can do the same as https://github.com/microsoft/hcsshim/pull/1013/files/d3f1ab7aff4da7a2e367a9a05ab5b2c6c919fcca..f568d433f83efc97f2eaecb882ef8e1e79357f23#r623456888 also

Copy link
Copy Markdown
Contributor Author

@vikas-bh vikas-bh Apr 29, 2021

Choose a reason for hiding this comment

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

I have no idea why they were not made constants in the first place over here :). I would prefer we not change this as these are being used from kubeproxy.

Copy link
Copy Markdown
Contributor

@dcantah dcantah Apr 29, 2021

Choose a reason for hiding this comment

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

Just checking in case anyone knew 😆. Them being constants wouldn't affect anything on them pulling in a new release though, so it should be harmless. They'll be the same type (and value), just not reassignable now.

Copy link
Copy Markdown
Contributor

@dcantah dcantah Apr 29, 2021

Choose a reason for hiding this comment

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

Just code hygiene


// LoadBalancerPortMappingFlags are special settings on a loadbalancer.
Expand Down
7 changes: 7 additions & 0 deletions hcn/hcnpolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ type SubnetPolicy struct {
// NatFlags are flags for portmappings.
type NatFlags uint32

const (
NatFlagsNone NatFlags = iota
NatFlagsLocalRoutedVip
NatFlagsIPv6
)

/// Endpoint Policy objects

// PortMappingPolicySetting defines Port Mapping (NAT)
Expand Down Expand Up @@ -135,6 +141,7 @@ type OutboundNatPolicySetting struct {
VirtualIP string `json:",omitempty"`
Exceptions []string `json:",omitempty"`
Destinations []string `json:",omitempty"`
Flags NatFlags `json:",omitempty"`
Copy link
Copy Markdown
Contributor Author

@vikas-bh vikas-bh Apr 29, 2021

Choose a reason for hiding this comment

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

It appears that the version check for ipv6 support already exists in the form of IPv6DualStackSupported. If more checks need to be added please let me know.

Copy link
Copy Markdown
Contributor Author

@vikas-bh vikas-bh Apr 29, 2021

Choose a reason for hiding this comment

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

Should an enum be defined as well for each value of NatFlags? Right now its just declared as an int:
// NatFlags are flags for portmappings.
type NatFlags uint32

so I did not add one just for ipv6.

Copy link
Copy Markdown
Contributor

@elweb9858 elweb9858 Apr 29, 2021

Choose a reason for hiding this comment

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

Yes, I think it's a good idea to define the enum. Something like this

}

// SDNRoutePolicySetting sets SDN Route on an Endpoint.
Expand Down