Skip to content

Commit 9d969d1

Browse files
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

File tree

7 files changed

+2
-10
lines changed

7 files changed

+2
-10
lines changed

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

-5
This file was deleted.

hack/lib/constants.sh

+1-1
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

-1
This file was deleted.

pkg/network/node/egressip.go

-2
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 pkg/network/sdn-cni-plugin/openshift-sdn.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// build +linux
1+
// +build linux
22

33
package main
44

sdn-cni-plugin

-6.51 MB
Binary file not shown.

0 commit comments

Comments
 (0)