Skip to content

[Windows] Keep the network state cleanup behavior unchanged #681

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 1 commit into from
Oct 1, 2020
Merged

[Windows] Keep the network state cleanup behavior unchanged #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cni/network/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func (plugin *netPlugin) Start(config *common.PluginConfig) error {
common.LogNetworkInterfaces()

// Initialize network manager.
err = plugin.nm.Initialize(config, false)
err = plugin.nm.Initialize(config, rehydrateNetworkInfoOnReboot)
if err != nil {
log.Printf("[cni-net] Failed to initialize network manager, err:%v.", err)
return err
Expand Down
3 changes: 2 additions & 1 deletion cni/network/network_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ const (
)

const (
snatConfigFileName = "/tmp/snatConfig"
snatConfigFileName = "/tmp/snatConfig"
rehydrateNetworkInfoOnReboot = false
)

// handleConsecutiveAdd is a dummy function for Linux platform.
Expand Down
6 changes: 5 additions & 1 deletion cni/network/network_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ var (
win1903Version = 18362
)

const (
rehydrateNetworkInfoOnReboot = true
)

/* handleConsecutiveAdd handles consecutive add calls for infrastructure containers on Windows platform.
* This is a temporary work around for issue #57253 of Kubernetes.
* We can delete this if statement once they fix it.
Expand Down Expand Up @@ -268,7 +272,7 @@ func addIPV6EndpointPolicy(nwInfo network.NetworkInfo) (policy.Policy, error) {
return eppolicy, fmt.Errorf("network state doesn't have ipv6 subnet")
}

// Everything should be snat'd except podcidr
// Everything should be snat'd except podcidr
exceptionList := []string{nwInfo.Subnets[1].Prefix.String()}
rawPolicy, _ := json.Marshal(&hcsshim.OutboundNatPolicy{
Policy: hcsshim.Policy{Type: hcsshim.OutboundNat},
Expand Down