Prepare for Windows "host-gw" and "vxlan" support

- update vendors (*) github.com/Microsoft/hcsshim (*) github.com/rakelkar/gonetsh (*) github.com/Microsoft/go-winio (*) github.com/sirupsen/logrus (*) github.com/buger/jsonparser - update Markfile Co-authored-by: rakelkar <rakelkar@outlook.com> Co-authored-by: madhanrm <madhanrajm@outlook.com>
flannel-io · Nov 6, 2018 · 6d72802 · 6d72802
1 parent 29fc3a7
commit 6d72802
Show file tree

Hide file tree

Showing 700 changed files with 117,802 additions and 25,993 deletions.
diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ dist/flanneld: $(shell find . -type f  -name '*.go')
 	  -ldflags '-s -w -X github.com/coreos/flannel/version.Version=$(TAG) -extldflags "-static"'
 
 dist/flanneld.exe: $(shell find . -type f  -name '*.go')
-	GOOS=windows go build -o dist/flanneld.exe \
+	CXX=x86_64-w64-mingw32-g++ CC=x86_64-w64-mingw32-gcc CGO_ENABLED=1 GOOS=windows go build -o dist/flanneld.exe \
 	  -ldflags '-s -w -X github.com/coreos/flannel/version.Version=$(TAG) -extldflags "-static"'
 
 # This will build flannel natively using golang image

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -62,4 +62,10 @@ import:
   version: v1.1
 - package: github.com/bronze1man/goStrongswanVici
   version: 4d72634a2f113aa48347dbc7dcb14adb806b6534
-
+- package: github.com/Microsoft/hcsshim
+  version: v0.7.4
+- package: github.com/Microsoft/go-winio
+  version: v0.4.11
+- pacakge: github.com/sirupsen/logrus
+  version: v1.0.6
+- package: github.com/buger/jsonparser
diff --git a/vendor/github.com/Microsoft/go-winio/LICENSE b/vendor/github.com/Microsoft/go-winio/LICENSE
diff --git a/vendor/github.com/Microsoft/go-winio/README.md b/vendor/github.com/Microsoft/go-winio/README.md
diff --git a/vendor/github.com/Microsoft/go-winio/archive/tar/LICENSE b/vendor/github.com/Microsoft/go-winio/archive/tar/LICENSE