Merge pull request #360 from zexi/ocnet-cni

Ocnet cni

Makefile

@@ -52,6 +52,7 @@ prepare_dir:
 
 mod:
 	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get yunion.io/x/onecloud@$(RELEASE_BRANCH)
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get yunion.io/x/sdnagent@$(RELEASE_BRANCH)
 	#GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v '/onecloud$$'))
 	go mod tidy
 	go mod vendor -v

cmd/ocnet-cni/10-ocnet-cni.conflist

@@ -0,0 +1,9 @@
+{
+  "name": "pod-network",
+  "cniVersion": "0.3.1",
+  "plugins": [
+    {
+      "type": "ocnet-cni"
+    }
+  ]
+}

cmd/ocnet-cni/main.go

@@ -0,0 +1,21 @@
+package main
+
+import (
+	"os"
+	"path/filepath"
+
+	"yunion.io/x/log"
+
+	"yunion.io/x/kubecomps/pkg/cni-plugin/plugin"
+)
+
+func main() {
+	// Use the name of the binary to determine which routine to run.
+	_, filename := filepath.Split(os.Args[0])
+	switch filename {
+	case "ocnet-cni":
+		plugin.Main("unknown version")
+	default:
+		log.Fatalf("Unsupported %s", filename)
+	}
+}

go.mod

@@ -6,7 +6,9 @@ require (
 	github.com/Masterminds/semver/v3 v3.1.0
 	github.com/Masterminds/sprig v2.22.0+incompatible
 	github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94
-	github.com/fsnotify/fsnotify v1.5.1
+	github.com/containernetworking/cni v0.8.0
+	github.com/containernetworking/plugins v0.8.7
+	github.com/fsnotify/fsnotify v1.5.4
 	github.com/ghodss/yaml v1.0.0
 	github.com/gofrs/flock v0.8.0
 	github.com/goharbor/go-client v0.26.2
@@ -19,6 +21,7 @@ require (
 	github.com/regclient/regclient v0.4.8
 	github.com/smartystreets/goconvey v1.7.2
 	github.com/stretchr/testify v1.8.1
+	github.com/vishvananda/netlink v1.1.0
 	go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5
 	golang.org/x/crypto v0.8.0
 	golang.org/x/sync v0.1.0
@@ -39,10 +42,11 @@ require (
 	sigs.k8s.io/yaml v1.2.0
 	yunion.io/x/code-generator v0.0.0-20230130032150-a6851cfe4737
 	yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401
-	yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361
-	yunion.io/x/onecloud v0.0.0-20240305022950-ed2dd1f548c2
+	yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
+	yunion.io/x/onecloud v0.0.0-20240312053540-299846783d7f
 	yunion.io/x/pkg v1.10.1-0.20240303050651-73685b15a96e
-	yunion.io/x/sqlchemy v1.1.3-0.20240304110946-16faa82225e6
+	yunion.io/x/sdnagent v1.2.10-0.20240129094758-082d26e0e076
+	yunion.io/x/sqlchemy v1.1.3-0.20240309151155-b34f29f02c79
 )
 
 require (
@@ -74,6 +78,7 @@ require (
 	github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
 	github.com/containerd/containerd v1.3.4 // indirect
 	github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41 // indirect
+	github.com/coreos/go-iptables v0.6.0 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
@@ -82,6 +87,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deislabs/oras v0.8.1 // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
+	github.com/digitalocean/go-openvswitch v0.0.0-20190515160856-1141932ed5cf // indirect
 	github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492 // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v1.4.2-0.20200309214505-aa6a9891b09c // indirect
@@ -183,6 +189,7 @@ require (
 	github.com/rs/xid v1.2.1 // indirect
 	github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 // indirect
 	github.com/russross/blackfriday v1.5.2 // indirect
+	github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8 // indirect
 	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/shirou/gopsutil/v3 v3.22.10 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
@@ -196,7 +203,6 @@ require (
 	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/tredoe/osutil/v2 v2.0.0-rc.16 // indirect
 	github.com/ugorji/go/codec v1.1.7 // indirect
-	github.com/vishvananda/netlink v1.1.0 // indirect
 	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -239,13 +245,14 @@ require (
 	rsc.io/letsencrypt v0.0.3 // indirect
 	sigs.k8s.io/kustomize v2.0.3+incompatible // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.0.1 // indirect
-	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240304114831-feebc346e513 // indirect
+	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240308095624-f1aeca8dcd51 // indirect
 	yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 // indirect
 	yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e // indirect
 	yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c // indirect
 )
 
 replace (
+	github.com/digitalocean/go-openvswitch => github.com/yousong/go-openvswitch v0.0.0-20200422025222-6b2d502be872
 	github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
 
 	github.com/go-openapi/analysis => github.com/go-openapi/analysis v0.19.8