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

Add macvlan to linux multicall binary

Browse Source 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson
2024-01-16 21:35:58 +00:00
parent 1255b64eed
commit 098cc198b7
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main_linux.go
View File

@@ -16,6 +16,7 @@ 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"
@@ -30,6 +31,7 @@ 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 main package macvlan
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 main package macvlan_test
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 main package macvlan
import ( import (
"encoding/json" "encoding/json"