Merge pull request #19989 from smarterclayton/cni_server

openshift-merge-robot · web-flow · commit a09659619c0b · 2018-06-12T19:03:02.000-07:00
3.11 - Move binaries into cmd/ where they belong
diff --git a/cmd/sdn-cni-plugin/openshift-sdn.go b/cmd/sdn-cni-plugin/openshift-sdn.go
@@ -0,0 +1,5 @@
+// +build !linux
+
+package main
+
+func main() {}
diff --git a/cmd/sdn-cni-plugin/openshift-sdn_linux.go b/cmd/sdn-cni-plugin/openshift-sdn_linux.go
@@ -1,4 +1,4 @@
-// +build linux
+// build +linux
 
 package main
 
diff --git a/cmd/sdn-cni-plugin/sdn_cni_plugin_test.go b/cmd/sdn-cni-plugin/sdn_cni_plugin_test.go
diff --git a/hack/lib/constants.sh b/hack/lib/constants.sh
@@ -28,7 +28,7 @@ readonly OS_OUTPUT_BINPATH="${OS_OUTPUT}/bin"
 readonly OS_OUTPUT_PKGDIR="${OS_OUTPUT}/pkgdir"
 
 readonly OS_SDN_COMPILE_TARGETS_LINUX=(
-  pkg/network/sdn-cni-plugin
+  cmd/sdn-cni-plugin
   vendor/github.com/containernetworking/plugins/plugins/ipam/host-local
   vendor/github.com/containernetworking/plugins/plugins/main/loopback
 )
diff --git a/pkg/network/node/cniserver/doc.go b/pkg/network/node/cniserver/doc.go
@@ -0,0 +1 @@
+package cniserver
diff --git a/pkg/network/node/egressip.go b/pkg/network/node/egressip.go
@@ -1,3 +1,5 @@
+// +build linux
+
 package node
 
 import (
diff --git a/sdn-cni-plugin b/sdn-cni-plugin

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ readonly OS_OUTPUT_BINPATH="${OS_OUTPUT}/bin"`
`28`	`28`	`readonly OS_OUTPUT_PKGDIR="${OS_OUTPUT}/pkgdir"`
`29`	`29`
`30`	`30`	`readonly OS_SDN_COMPILE_TARGETS_LINUX=(`
`31`		`- pkg/network/sdn-cni-plugin`
	`31`	`+ cmd/sdn-cni-plugin`
`32`	`32`	`vendor/github.com/containernetworking/plugins/plugins/ipam/host-local`
`33`	`33`	`vendor/github.com/containernetworking/plugins/plugins/main/loopback`
`34`	`34`	`)`