diff --git a/main_linux.go b/main_linux.go index c6421b5b..33dc2834 100644 --- a/main_linux.go +++ b/main_linux.go @@ -16,7 +16,6 @@ import ( hostlocal "github.com/containernetworking/plugins/plugins/ipam/host-local" "github.com/containernetworking/plugins/plugins/main/bridge" "github.com/containernetworking/plugins/plugins/main/loopback" - "github.com/containernetworking/plugins/plugins/main/macvlan" "github.com/containernetworking/plugins/plugins/meta/bandwidth" "github.com/containernetworking/plugins/plugins/meta/firewall" "github.com/containernetworking/plugins/plugins/meta/flannel" @@ -31,7 +30,6 @@ func main() { reexec.Register("flannel", flannel.Main) reexec.Register("host-local", hostlocal.Main) reexec.Register("loopback", loopback.Main) - reexec.Register("macvlan", macvlan.Main) reexec.Register("portmap", portmap.Main) if !reexec.Init() { _, _ = fmt.Fprintln(os.Stderr, bv.BuildString("plugins")) diff --git a/plugins/main/macvlan/macvlan.go b/plugins/main/macvlan/macvlan.go index a9795941..7f6380fd 100644 --- a/plugins/main/macvlan/macvlan.go +++ b/plugins/main/macvlan/macvlan.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package macvlan +package main import ( "encoding/json" @@ -426,7 +426,7 @@ func cmdDel(args *skel.CmdArgs) error { return err } -func Main() { +func main() { skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, bv.BuildString("macvlan")) } diff --git a/plugins/main/macvlan/macvlan_suite_test.go b/plugins/main/macvlan/macvlan_suite_test.go index 2164c660..0a24b796 100644 --- a/plugins/main/macvlan/macvlan_suite_test.go +++ b/plugins/main/macvlan/macvlan_suite_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package macvlan_test +package main import ( "testing" diff --git a/plugins/main/macvlan/macvlan_test.go b/plugins/main/macvlan/macvlan_test.go index 2e54c0fb..ae73f99f 100644 --- a/plugins/main/macvlan/macvlan_test.go +++ b/plugins/main/macvlan/macvlan_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package macvlan +package main import ( "encoding/json"