Skip to content

Fix NATing on *COW (HnsV2) Scenarios #596

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
merged 2 commits into from
Jul 15, 2020
Merged

Fix NATing on *COW (HnsV2) Scenarios #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dfdb8d
For HnsV2 we will only add outbound nat policy for single tenant scen…
Jun 29, 2020
7cff596
adding comments to detail results of determineSnat func
Jul 15, 2020
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
12 changes: 9 additions & 3 deletions cni/network/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,6 @@ func determineSnat() (bool, bool, error) {
log.Errorf("[cni-net] failed to unmarshal to snatConfig with error %v",
retrieveSnatConfigErr)
}

}

// If we weren't able to retrieve snatConfiguration, query NMAgent
Expand All @@ -1127,7 +1126,7 @@ func determineSnat() (bool, bool, error) {
fp.Write(jsonStr)
fp.Close()
} else {
log.Printf("[cni-net] failed to save snatConfig")
log.Errorf("[cni-net] failed to save snat settings to %s with error: %+v", snatConfigFile, err)
}
}
} else {
Expand All @@ -1143,7 +1142,14 @@ func determineSnat() (bool, bool, error) {
return snatConfig.EnableSnatForDns, snatConfig.EnableSnatOnHost, retrieveSnatConfigErr
}

log.Printf("[cni-net] EnableSnatOnHost set to %t; EnableSnatForDns set to %t", snatConfig.EnableSnatOnHost, snatConfig.EnableSnatForDns)
log.Printf("[cni-net] saved snat settings %+v to %s", snatConfig, snatConfigFile)
if snatConfig.EnableSnatOnHost {
log.Printf("[cni-net] enabling SNAT on container host for outbound connectivity")
} else if snatConfig.EnableSnatForDns {
log.Printf("[cni-net] enabling SNAT on container host for DNS traffic")
} else {
log.Printf("[cni-net] disabling SNAT on container host")
}

return snatConfig.EnableSnatForDns, snatConfig.EnableSnatOnHost, nil
}
8 changes: 6 additions & 2 deletions network/policy/policy_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,12 @@ func GetHcnEndpointPolicies(policyType CNIPolicyType, policies []Policy, epInfoD
if policy.Type == policyType {
var err error
var endpointPolicy hcn.EndpointPolicy
var isOutboundNatPolicy bool

switch GetPolicyType(policy) {
case OutBoundNatPolicy:
endpointPolicy, err = GetHcnOutBoundNATPolicy(policy, epInfoData)
isOutboundNatPolicy = true
case RoutePolicy:
endpointPolicy, err = GetHcnRoutePolicy(policy)
case PortMappingPolicy:
Expand All @@ -371,8 +373,10 @@ func GetHcnEndpointPolicies(policyType CNIPolicyType, policies []Policy, epInfoD
return hcnEndPointPolicies, err
}

hcnEndPointPolicies = append(hcnEndPointPolicies, endpointPolicy)
log.Printf("Successfully set the policy: %+v", endpointPolicy)
if !(isOutboundNatPolicy && enableMultiTenancy && !enableSnatForDns) {
hcnEndPointPolicies = append(hcnEndPointPolicies, endpointPolicy)
log.Printf("Successfully set the policy: %+v", endpointPolicy)
}
}
}

Expand Down