Skip to content

Commit 9d969d1

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #19993 from openshift/revert-19989-cni_server
Revert "3.11 - Move binaries into cmd/ where they belong"
2 parents 01d1b40 + 9e994b5 commit 9d969d1

7 files changed

Lines changed: 2 additions & 10 deletions

File tree

‎cmd/sdn-cni-plugin/openshift-sdn.go‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎hack/lib/constants.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ readonly OS_OUTPUT_BINPATH="${OS_OUTPUT}/bin"
2828
readonly OS_OUTPUT_PKGDIR="${OS_OUTPUT}/pkgdir"
2929

3030
readonly OS_SDN_COMPILE_TARGETS_LINUX=(
31-
cmd/sdn-cni-plugin
31+
pkg/network/sdn-cni-plugin
3232
vendor/github.com/containernetworking/plugins/plugins/ipam/host-local
3333
vendor/github.com/containernetworking/plugins/plugins/main/loopback
3434
)

‎pkg/network/node/cniserver/doc.go‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎pkg/network/node/egressip.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// +build linux
2-
31
package node
42

53
import (

cmd/sdn-cni-plugin/openshift-sdn_linux.go renamed to pkg/network/sdn-cni-plugin/openshift-sdn.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// build +linux
1+
// +build linux
22

33
package main
44

cmd/sdn-cni-plugin/sdn_cni_plugin_test.go renamed to pkg/network/sdn-cni-plugin/sdn_cni_plugin_test.go

File renamed without changes.

‎sdn-cni-plugin‎

-6.51 MB
Binary file not shown.

0 commit comments

Comments
 (0)