Skip to content

Add mcad image create #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 19, 2019
Merged

Add mcad image create #9

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0e49b4
Change executable name and related build references to mcad-controller.
dmatch01 Oct 18, 2019
730aa55
Added script and made changes to support script plus some additional …
dmatch01 Oct 19, 2019
ccf0131
Merge branch 'master' into add-mcad-image-create
dmatch01 Oct 19, 2019
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
Next Next commit
Change executable name and related build references to mcad-controller. 
Signed-off-by: Diana Arroyo <darroyo@us.ibm.com>
  • Loading branch information
@dmatch01
dmatch01 committed Oct 18, 2019
commit a0e49b4a1a2d7befa710d42edba366627e9bfd52
13 changes: 7 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ BIN_DIR=_output/bin
RELEASE_VER=v0.2
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,9 +20,9 @@ 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}
images: mcad-controller
cp ./_output/bin/mcad-controller ./deployment/images/
docker build ./deployment/images -t kubesigs/kube-batch:${RELEASE_VER}
rm -f ./deployment/images/kube-batch

run-test:
Expand All @@ -36,4 +37,4 @@ coverage:

clean:
rm -rf _output/
rm -f kar-controllers
rm -f mcad-controllers
2 changes: 1 addition & 1 deletion deployment/build-inside-container.sh
View file
Open in desktop
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