Skip to content
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

[27.x backport] Restore labels when re-creating Windows networks #49200

Merged
merged 1 commit into from
Jan 2, 2025
Merged

[27.x backport] Restore labels when re-creating Windows networks #49200

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
3 changes: 3 additions & 0 deletions daemon/daemon_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ func (daemon *Daemon) initNetworkController(daemonCfg *config.Config, activeSand
})

drvOptions := make(map[string]string)
var labels map[string]string
nid := ""
if n != nil {
nid = n.ID()
Expand All @@ -351,6 +352,7 @@ func (daemon *Daemon) initNetworkController(daemonCfg *config.Config, activeSand

// restore option if it existed before
drvOptions = n.DriverOptions()
labels = n.Labels()
n.Delete()
}
netOption := map[string]string{
Expand Down Expand Up @@ -388,6 +390,7 @@ func (daemon *Daemon) initNetworkController(daemonCfg *config.Config, activeSand
netlabel.GenericData: netOption,
}),
libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil),
libnetwork.NetworkOptionLabels(labels),
)
if err != nil {
log.G(context.TODO()).Errorf("Error occurred when creating network %v", err)
Expand Down
Loading