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
18 changes: 10 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
BIN_DIR=_output/bin
RELEASE_VER=v0.2
RELEASE_VER=v1.14
CURRENT_DIR=$(shell pwd)

kar-controller: init
CGO_ENABLED=0 GOARCH=amd64 go build -o ${BIN_DIR}/kar-controllers ./cmd/kar-controllers/
mcad-controller: init generate-code
$(info Compiling controller)
CGO_ENABLED=0 GOARCH=amd64 go build -o ${BIN_DIR}/mcad-controller ./cmd/kar-controllers/

verify: generate-code
# hack/verify-gofmt.sh
Expand All @@ -19,10 +20,11 @@ generate-code:
$(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/
GOPATH=${ORIG_GOPATH} docker build ./deployment/images -t kubesigs/kube-batch:${RELEASE_VER}
rm -f ./deployment/images/kube-batch
images:
$(info Changed to executable directory)
cd ./_output/bin
$(info Build the docker image)
docker build --no-cache --tag mcad-controller:deleteme -f ${CURRENT_DIR}/deployment/Dockerfile.both ${CURRENT_DIR}/_output/bin

run-test:
# hack/make-rules/test.sh $(WHAT) $(TESTS)
Expand All @@ -36,4 +38,4 @@ coverage:

clean:
rm -rf _output/
rm -f kar-controllers
rm -f mcad-controllers
3 changes: 1 addition & 2 deletions deployment/Dockerfile.both
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
From ubuntu:18.04

ADD kar-controllers /usr/local/bin
ADD xqueuejob_controller_deployment_cluster_resource_update.sh /usr/local/bin
ADD mcad-controller /usr/local/bin

RUN apt-get update
RUN apt-get -y upgrade
Expand Down
2 changes: 1 addition & 1 deletion deployment/build-inside-container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ set -x
apk add make
apk add git

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

project_root=$(cd ..; pwd)

cd ${project_root}

make images
Loading