consolidate kindnetd sources in image directory

kubernetes-sigs · Sep 12, 2019 · e9a25bf · e9a25bf
1 parent ef586c6
commit e9a25bf
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
diff --git a/hack/ci/build-all.sh b/hack/ci/build-all.sh
@@ -27,6 +27,6 @@ hack/release/build/cross.sh
 hack/go_container.sh go test -v ./...
 
 # build and test kindnetd
-cd ./cmd/kindnetd
-"${REPO_ROOT}/hack/go_container.sh" go build -v -o /out/kindnetd .
+cd "${REPO_ROOT}/images/kindnetd"
+"${REPO_ROOT}/hack/go_container.sh" go build -v -o /out/kindnetd ./cmd/kindnetd
 "${REPO_ROOT}/hack/go_container.sh" go test -v ./...
diff --git a/hack/verify/lint.sh b/hack/verify/lint.sh
@@ -38,5 +38,5 @@ ENABLE=$(sed 's/ /,/g' <<< "${LINTS[@]}")
 # first for the repo in general
 GO111MODULE=on bin/golangci-lint --disable-all --enable="${ENABLE}" run ./pkg/... ./cmd/... .
 # ... and then for kindnetd, which is only on linux
-SOURCE_DIR="${REPO_ROOT}/cmd/kindnetd" GOOS="linux" "${REPO_ROOT}/hack/go_container.sh" \
+SOURCE_DIR="${REPO_ROOT}/images/kindnetd" GOOS="linux" "${REPO_ROOT}/hack/go_container.sh" \
   /out/golangci-lint-linux --disable-all --enable="${ENABLE}" run ./...
diff --git a/images/kindnetd/build.sh b/images/kindnetd/build.sh
@@ -24,10 +24,10 @@ cd "${REPO_ROOT}"
 # build the binary
 export GOARCH="${GOARCH:-amd64}"
 export GOOS="linux"
-export SOURCE_DIR="${REPO_ROOT}/cmd/kindnetd"
+export SOURCE_DIR="${REPO_ROOT}/images/kindnetd"
 # NOTE: use a per-arch OUT_DIR so we send less in the docker build context
 export OUT_DIR="${REPO_ROOT}/bin/kindnetd/${GOARCH}"
-hack/go_container.sh go build -v -o /out/kindnetd
+hack/go_container.sh go build -v -o /out/kindnetd ./cmd/kindnetd
 
 # TODO: verisoning
 # build image

diff --git a/cmd/kindnetd/cni.go → images/kindnetd/cmd/kindnetd/cni.go b/cmd/kindnetd/cni.go → images/kindnetd/cmd/kindnetd/cni.go
diff --git a/cmd/kindnetd/main.go → images/kindnetd/cmd/kindnetd/main.go b/cmd/kindnetd/main.go → images/kindnetd/cmd/kindnetd/main.go
diff --git a/cmd/kindnetd/masq.go → images/kindnetd/cmd/kindnetd/masq.go b/cmd/kindnetd/masq.go → images/kindnetd/cmd/kindnetd/masq.go
diff --git a/cmd/kindnetd/routes.go → images/kindnetd/cmd/kindnetd/routes.go b/cmd/kindnetd/routes.go → images/kindnetd/cmd/kindnetd/routes.go
diff --git a/cmd/kindnetd/go.mod → images/kindnetd/go.mod b/cmd/kindnetd/go.mod → images/kindnetd/go.mod
@@ -1,4 +1,4 @@
-module sigs.k8s.io/kind/cmd/kindnetd
+module sigs.k8s.io/kind/images/kindnetd
 
 go 1.13
 

diff --git a/cmd/kindnetd/go.sum → images/kindnetd/go.sum b/cmd/kindnetd/go.sum → images/kindnetd/go.sum