Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
BIN_DIR=_output/bin
RELEASE_VER=v0.2
CONTRIB_VENDOR_GOPATH=${HOME}/tmp/contrib/DLaaS
CURRENT_DIR=$(shell pwd)
CONTRIB_VENDOR_GOPATH_SRC_TARGET=${CURRENT_DIR}/vendor
SYM_LINK_EXISTS=$(shell [ -e ${CONTRIB_VENDOR_GOPATH}/src ] && echo 1 || echo 0 )
ORIG_GOPATH=${GOPATH}

kar-controller: init
CGO_ENABLED=0 GOARCH=amd64 go build -o ${BIN_DIR}/kar-controllers ./cmd/kar-controllers/
Expand All @@ -17,9 +13,11 @@ verify: generate-code
init:
mkdir -p ${BIN_DIR}

generate-code: set_gopath_to_generate_code
GOPATH=${ORIG_GOPATH} go build -o ${BIN_DIR}/deepcopy-gen ./cmd/deepcopy-gen/
GOPATH=${CONTRIB_VENDOR_GOPATH}:${GOPATH} ${BIN_DIR}/deepcopy-gen -i ./pkg/apis/controller/v1alpha1/ -O zz_generated.deepcopy -o ../../../../..
generate-code:
$(info Compiling deepcopy-gen)
go build -o ${BIN_DIR}/deepcopy-gen ./cmd/deepcopy-gen/
$(info Generating deepcopy)
${BIN_DIR}/deepcopy-gen -i ./pkg/apis/controller/v1alpha1/ -O zz_generated.deepcopy

images: kube-batch
cp ./_output/bin/kube-batch ./deployment/images/
Expand All @@ -39,14 +37,3 @@ coverage:
clean:
rm -rf _output/
rm -f kar-controllers

set_gopath_to_generate_code: set_gopath_to_generate_code_clean
$(info Make a temporary path to hold the creation of a symbolic link for contrib vendor directory)
mkdir -p ${CONTRIB_VENDOR_GOPATH}
$(info Set symbolic link inside the path of the CONTRIB_VENDOR_GOPATH variable to link to vender directory in contrib)
cd ${CONTRIB_VENDOR_GOPATH} && ln -s ${CONTRIB_VENDOR_GOPATH_SRC_TARGET} src


set_gopath_to_generate_code_clean:
$(info Removing symbolic link to vender directory in contrib)
$(shell if [ "${SYM_LINK_EXISTS}" = "1" ]; then cd ${CONTRIB_VENDOR_GOPATH}; rm src; fi;)
6 changes: 0 additions & 6 deletions deployment/Dockerfile.build

This file was deleted.

12 changes: 0 additions & 12 deletions deployment/Dockerfile.dispatcher

This file was deleted.

12 changes: 0 additions & 12 deletions deployment/Dockerfile.dispatcher.all.agents

This file was deleted.

8 changes: 8 additions & 0 deletions deployment/build-inside-container.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/sh

set -x

apk add make
apk add git

cd .. && make generate-code && make kar-controller
10 changes: 10 additions & 0 deletions deployment/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash
set -x

project_root=$(cd ..; pwd)
git_path=github.com/kubernetes-sigs/kube-batch

container_id=$(docker run --rm -v "$project_root":/go/src/$git_path -d -w /go/src/$git_path/deployment golang:alpine ./build-inside-container.sh)
#container_id=$(docker run --rm -v "$project_root":/go/src/$git_path -d -w /go/src/$git_path/deployment golang:alpine sleep 999999999)

docker logs -f $container_id
3 changes: 0 additions & 3 deletions deployment/build_compile_image_1.sh

This file was deleted.

8 changes: 0 additions & 8 deletions deployment/compile_kar_2.sh

This file was deleted.