opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-28 00:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated --macvlan flag from network create

Browse Source 
The --macvlan flag was deprecated in Podman 3.x and was scheduled
for removal in version 4.0. Since we're now at version 6.0.0-dev,
this commit removes the deprecated flag and its associated code.
Users should now use the standard syntax:
  podman network create --driver macvlan --opt parent=<device> <name>

Signed-off-by: shiavm006 <shivammittal42006@gmail.com>
This commit is contained in:
shiavm006
2025-11-24 16:21:35 +05:30
parent 25c358e374
commit 786012a670
3 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/podman/networks/create.go
View File

@@ -11,7 +11,6 @@ import (
"github.com/containers/podman/v6/cmd/podman/parse" "github.com/containers/podman/v6/cmd/podman/parse"
"github.com/containers/podman/v6/cmd/podman/registry" "github.com/containers/podman/v6/cmd/podman/registry"
"github.com/containers/podman/v6/pkg/domain/entities" "github.com/containers/podman/v6/pkg/domain/entities"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"go.podman.io/common/libnetwork/types" "go.podman.io/common/libnetwork/types"
"go.podman.io/common/libnetwork/util" "go.podman.io/common/libnetwork/util"
@@ -60,12 +59,6 @@ func networkCreateFlags(cmd *cobra.Command) {
flags.StringArrayVar(&networkCreateOptions.Ranges, ipRangeFlagName, nil, "allocate container IP from range") flags.StringArrayVar(&networkCreateOptions.Ranges, ipRangeFlagName, nil, "allocate container IP from range")
_ = cmd.RegisterFlagCompletionFunc(ipRangeFlagName, completion.AutocompleteNone) _ = cmd.RegisterFlagCompletionFunc(ipRangeFlagName, completion.AutocompleteNone)
// TODO consider removing this for 4.0
macvlanFlagName := "macvlan"
flags.StringVar(&networkCreateOptions.MacVLAN, macvlanFlagName, "", "create a Macvlan connection based on this device")
// This option is deprecated
_ = flags.MarkHidden(macvlanFlagName)
labelFlagName := "label" labelFlagName := "label"
flags.StringArrayVar(&labels, labelFlagName, nil, "set metadata on a network") flags.StringArrayVar(&labels, labelFlagName, nil, "set metadata on a network")
_ = cmd.RegisterFlagCompletionFunc(labelFlagName, completion.AutocompleteNone) _ = cmd.RegisterFlagCompletionFunc(labelFlagName, completion.AutocompleteNone)
@@ -136,12 +129,7 @@ func networkCreate(cmd *cobra.Command, args []string) error {
} }
} }
// old --macvlan option if networkCreateOptions.Driver == types.MacVLANNetworkDriver || networkCreateOptions.Driver == types.IPVLANNetworkDriver {
if networkCreateOptions.MacVLAN != "" {
logrus.Warn("The --macvlan option is deprecated, use `--driver macvlan --opt parent=<device>` instead")
network.Driver = types.MacVLANNetworkDriver
network.NetworkInterface = networkCreateOptions.MacVLAN
} else if networkCreateOptions.Driver == types.MacVLANNetworkDriver || networkCreateOptions.Driver == types.IPVLANNetworkDriver {
// new -d macvlan --opt parent=... syntax // new -d macvlan --opt parent=... syntax
if parent, ok := network.Options["parent"]; ok { if parent, ok := network.Options["parent"]; ok {
network.NetworkInterface = parent network.NetworkInterface = parent

1
pkg/domain/entities/network.go
View File

@@ -39,7 +39,6 @@ type NetworkCreateOptions struct {
Gateways []net.IP Gateways []net.IP
Internal bool Internal bool
Labels map[string]string Labels map[string]string
MacVLAN string
NetworkDNSServers []string NetworkDNSServers []string
Ranges []string Ranges []string
Subnets []string Subnets []string

13
test/e2e/network_test.go
View File

@@ -550,19 +550,6 @@ var _ = Describe("Podman network", func() {
Expect(c3).Should(ExitCleanly()) Expect(c3).Should(ExitCleanly())
}) })
It("podman network create/remove macvlan", func() {
net := "macvlan" + stringid.GenerateRandomID()
nc := podmanTest.Podman([]string{"network", "create", "--macvlan", "lo", net})
nc.WaitWithDefaultTimeout()
defer podmanTest.removeNetwork(net)
// Cannot ExitCleanly(): "The --macvlan option is deprecated..."
Expect(nc).Should(Exit(0))
nc = podmanTest.Podman([]string{"network", "rm", net})
nc.WaitWithDefaultTimeout()
Expect(nc).Should(ExitCleanly())
})
It("podman network create/remove macvlan as driver (-d) no device name", func() { It("podman network create/remove macvlan as driver (-d) no device name", func() {
net := "macvlan" + stringid.GenerateRandomID() net := "macvlan" + stringid.GenerateRandomID()
nc := podmanTest.Podman([]string{"network", "create", "-d", "macvlan", net}) nc := podmanTest.Podman([]string{"network", "create", "-d", "macvlan", net})