api/t/ctr: deprecate NetworkSettingsBase

akerouanton · akerouanton · commit 80bb864fd611 · 2025-08-29T15:21:34.000+02:00
Most fields in NetworkSettingsBase are deprecated, so deprecate the
whole struct. The few fields which aren't deprecated will move to the
NetworkSettings struct in v29.

Signed-off-by: Albin Kerouanton &lt;albinker@gmail.com&gt;
diff --git a/api/types/container/network_settings.go b/api/types/container/network_settings.go
@@ -12,6 +12,9 @@ type NetworkSettings struct {
 }
 
 // NetworkSettingsBase holds networking state for a container when inspecting it.
+//
+// Deprecated: Most fields in NetworkSettingsBase are deprecated. Fields which aren't deprecated will move to
+// NetworkSettings in v29.0, and this struct will be removed.
 type NetworkSettingsBase struct {
 	Bridge     string  // Deprecated: This field is only set when the daemon is started with the --bridge flag specified.
 	SandboxID  string  // SandboxID uniquely represents a container's network stack
diff --git a/daemon/inspect.go b/daemon/inspect.go
@@ -49,7 +49,7 @@ func (daemon *Daemon) ContainerInspect(ctx context.Context, name string, options
 	}
 
 	networkSettings := &containertypes.NetworkSettings{
-		NetworkSettingsBase: containertypes.NetworkSettingsBase{
+		NetworkSettingsBase: containertypes.NetworkSettingsBase{ //nolint:staticcheck // ignore SA1019: NetworkSettingsBase is deprecated in v28.4.
 			Bridge:                 ctr.NetworkSettings.Bridge,
 			SandboxID:              ctr.NetworkSettings.SandboxID,
 			SandboxKey:             ctr.NetworkSettings.SandboxKey,
diff --git a/vendor/github.com/moby/moby/api/types/container/network_settings.go b/vendor/github.com/moby/moby/api/types/container/network_settings.go

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,9 @@ type NetworkSettings struct {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`// NetworkSettingsBase holds networking state for a container when inspecting it.`
	`15`	`+//`
	`16`	`+// Deprecated: Most fields in NetworkSettingsBase are deprecated. Fields which aren't deprecated will move to`
	`17`	`+// NetworkSettings in v29.0, and this struct will be removed.`
`15`	`18`	`type NetworkSettingsBase struct {`
`16`	`19`	`Bridge string // Deprecated: This field is only set when the daemon is started with the --bridge flag specified.`
`17`	`20`	`SandboxID string // SandboxID uniquely represents a container's network stack`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func (daemon *Daemon) ContainerInspect(ctx context.Context, name string, options`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`networkSettings := &containertypes.NetworkSettings{`
`52`		`- NetworkSettingsBase: containertypes.NetworkSettingsBase{`
	`52`	`+ NetworkSettingsBase: containertypes.NetworkSettingsBase{ //nolint:staticcheck // ignore SA1019: NetworkSettingsBase is deprecated in v28.4.`
`53`	`53`	`Bridge: ctr.NetworkSettings.Bridge,`
`54`	`54`	`SandboxID: ctr.NetworkSettings.SandboxID,`
`55`	`55`	`SandboxKey: ctr.NetworkSettings.SandboxKey,`