rancher/plugins
1
0
Fork 1
mirror of https://github.com/rancher/plugins.git synced 2025-08-30 23:31:46 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Add macvlan to linux multicall binary"

Browse Source 
This reverts commit 098cc198b7.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson 2024-01-25 17:54:56 +00:00
parent 098cc198b7
commit e6c5f7d8d3
No known key found for this signature in database
GPG Key ID: FFB7A9376A9349B9
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main_linux.go
View File

@ -16,7 +16,6 @@ import (
hostlocal "github.com/containernetworking/plugins/plugins/ipam/host-local" hostlocal "github.com/containernetworking/plugins/plugins/ipam/host-local"
"github.com/containernetworking/plugins/plugins/main/bridge" "github.com/containernetworking/plugins/plugins/main/bridge"
"github.com/containernetworking/plugins/plugins/main/loopback" "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/bandwidth"
"github.com/containernetworking/plugins/plugins/meta/firewall" "github.com/containernetworking/plugins/plugins/meta/firewall"
"github.com/containernetworking/plugins/plugins/meta/flannel" "github.com/containernetworking/plugins/plugins/meta/flannel"
@ -31,7 +30,6 @@ func main() {
reexec.Register("flannel", flannel.Main) reexec.Register("flannel", flannel.Main)
reexec.Register("host-local", hostlocal.Main) reexec.Register("host-local", hostlocal.Main)
reexec.Register("loopback", loopback.Main) reexec.Register("loopback", loopback.Main)
reexec.Register("macvlan", macvlan.Main)
reexec.Register("portmap", portmap.Main) reexec.Register("portmap", portmap.Main)
if !reexec.Init() { if !reexec.Init() {
_, _ = fmt.Fprintln(os.Stderr, bv.BuildString("plugins")) _, _ = fmt.Fprintln(os.Stderr, bv.BuildString("plugins"))

4
plugins/main/macvlan/macvlan.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package macvlan package main
import ( import (
"encoding/json" "encoding/json"
@ -426,7 +426,7 @@ func cmdDel(args *skel.CmdArgs) error {
return err return err
} }
func Main() { func main() {
skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, bv.BuildString("macvlan")) skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, bv.BuildString("macvlan"))
} }

2
plugins/main/macvlan/macvlan_suite_test.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package macvlan_test package main
import ( import (
"testing" "testing"

2
plugins/main/macvlan/macvlan_test.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package macvlan package main
import ( import (
"encoding/json" "encoding/json"