Skip to content
Permalink
Browse files

Merge pull request #854 from BenTheElder/consolidate-kindnetd

consolidate kindnetd sources in image directory
  • Loading branch information...
k8s-ci-robot committed Sep 12, 2019
2 parents 9686a52 + e9a25bf commit 54471c23b742b75c8c9baaa6979bd63576c618f3
@@ -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 ./...
@@ -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 ./...
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,4 +1,4 @@
module sigs.k8s.io/kind/cmd/kindnetd
module sigs.k8s.io/kind/images/kindnetd

go 1.13

File renamed without changes.

0 comments on commit 54471c2

Please sign in to comment.
You can’t perform that action at this time.