Upgrade the golang version for the quota-management branch.

.gitignore

@@ -125,3 +125,9 @@ kubernetes.tar.gz
 /bazel-*
 *.pyc
 
+# .devcontainer files
+.devcontainer
+
+# .devcontainer files
+.devcontainer
+

.travis.yml

@@ -9,15 +9,15 @@ services:
   - docker
 
 go:
-  - "1.16.3"
+  - "1.18.10"
 
 go_import_path: github.com/project-codeflare/multi-cluster-app-dispatcher
 
-install:
-  - go get -u golang.org/x/lint/golint
+install: []
+
 
 before_script:
-  - export TEST_LOG_LEVEL=4
+  - export TEST_LOG_LEVEL=2
 
 script:
   - BLUE='\033[34m'

CONTROLLER_VERSION

@@ -1 +1 @@
-1.29.55
+1.29.58

Dockerfile

@@ -0,0 +1,33 @@
+FROM registry.access.redhat.com/ubi8/go-toolset:1.18.10-1 AS BUILDER
+ARG GO_BUILD_ARGS
+WORKDIR /workdir
+USER root
+
+COPY Makefile Makefile
+COPY go.mod go.mod
+COPY go.sum go.sum
+COPY cmd cmd
+COPY pkg pkg
+COPY hack hack
+COPY CONTROLLER_VERSION CONTROLLER_VERSION
+
+RUN cd /workdir && curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/$(go env GOARCH)/kubectl && chmod +x kubectl
+ENV GO_BUILD_ARGS=$GO_BUILD_ARGS
+RUN echo "Go build args: $GO_BUILD_ARGS" && \
+    make mcad-controller
+
+FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+
+COPY --from=BUILDER /workdir/_output/bin/mcad-controller /usr/local/bin
+COPY --from=BUILDER /workdir/kubectl /usr/local/bin
+
+RUN true \
+    && microdnf update \
+    && microdnf clean all \
+    && true
+
+WORKDIR /usr/local/bin
+
+RUN chown -R 1000:1000 /usr/local/bin
+
+USER 1000

Makefile

@@ -4,6 +4,9 @@ VERSION_FILE=./CONTROLLER_VERSION
 RELEASE_VER=v$(shell $(CAT_CMD) $(VERSION_FILE))
 CURRENT_DIR=$(shell pwd)
 GIT_BRANCH:=$(shell git symbolic-ref --short HEAD 2>&1 | grep -v fatal)
+#define the GO_BUILD_ARGS if you need to pass additional arguments to the go build
+GO_BUILD_ARGS?=
+
 # Reset branch name if this a Travis CI environment
 ifneq ($(strip $(TRAVIS_BRANCH)),)
 	GIT_BRANCH:=${TRAVIS_BRANCH}
@@ -18,14 +21,23 @@ endif
 # Check for current branch name
 ifneq ($(strip $(GIT_BRANCH)),)
 	TAG:=${TAG}${GIT_BRANCH}-
+
+# 	replace invalid characters that might exist in the branch name
+	TAG:=$(shell echo ${TAG} | sed 's/[^a-zA-Z0-9]/-/g')
 endif
 TAG:=${TAG}${RELEASE_VER}
 
 .PHONY: print-global-variables
 
+# Build the controler executable for use in docker image build
 mcad-controller: init generate-code
+ifeq ($(strip $(GO_BUILD_ARGS)),)
 	$(info Compiling controller)
-	CGO_ENABLED=0 GOARCH=amd64 go build -o ${BIN_DIR}/mcad-controller ./cmd/kar-controllers/
+	CGO_ENABLED=0 go build -o ${BIN_DIR}/mcad-controller ./cmd/kar-controllers/
+else
+	$(info Compiling controller with build arguments: '${GO_BUILD_ARGS}')
+	go build $(GO_BUILD_ARGS) -o ${BIN_DIR}/mcad-controller ./cmd/kar-controllers/
+endif	
 
 print-global-variables:
 	$(info "---")
@@ -34,6 +46,7 @@ print-global-variables:
 	$(info "  "GIT_BRANCH="$(GIT_BRANCH)")
 	$(info "  "RELEASE_VER="$(RELEASE_VER)")
 	$(info "  "TAG="$(TAG)")
+	$(info "  "GO_BUILD_ARGS="$(GO_BUILD_ARGS)")
 	$(info "---")
 
 verify: generate-code
@@ -48,32 +61,42 @@ verify-tag-name: print-global-variables
 	# Check for invalid tag name
 	t=${TAG} && [ $${#t} -le 128 ] || { echo "Target name $$t has 128 or more chars"; false; }
 
-generate-code:
-	$(info Compiling deepcopy-gen...)
-	go build -o ${BIN_DIR}/deepcopy-gen ./cmd/deepcopy-gen/
+generate-code: pkg/apis/controller/v1beta1/zz_generated.deepcopy.go
+
+pkg/apis/controller/v1beta1/zz_generated.deepcopy.go: ${BIN_DIR}/deepcopy-gen
 	$(info Generating deepcopy...)
 	${BIN_DIR}/deepcopy-gen -i ./pkg/apis/controller/v1beta1/ -O zz_generated.deepcopy 
 	${BIN_DIR}/deepcopy-gen -i ./pkg/apis/quotaplugins/quotasubtree/v1 -O zz_generated.deepcopy
 
-images: verify-tag-name
+${BIN_DIR}/deepcopy-gen:	
+	$(info Compiling deepcopy-gen...)
+	go build -o ${BIN_DIR}/deepcopy-gen ./cmd/deepcopy-gen/
+
+images: verify-tag-name generate-code
 	$(info List executable directory)
 	$(info repo id: ${git_repository_id})
 	$(info branch: ${GIT_BRANCH})
-	ls -l ${CURRENT_DIR}/_output/bin
 	$(info Build the docker image)
-	docker build --quiet --no-cache --tag mcad-controller:${TAG} -f ${CURRENT_DIR}/deployment/Dockerfile.both  ${CURRENT_DIR}/_output/bin
+ifeq ($(strip $(GO_BUILD_ARGS)),)
+	docker build --quiet --no-cache --tag mcad-controller:${TAG} -f ${CURRENT_DIR}/Dockerfile  ${CURRENT_DIR}
+else 
+	docker build --no-cache --tag mcad-controller:${TAG} --build-arg GO_BUILD_ARGS=$(GO_BUILD_ARGS) -f ${CURRENT_DIR}/Dockerfile  ${CURRENT_DIR}
+endif		
 
-images-podman: verify-tag-name
+images-podman: verify-tag-name generate-code
 	$(info List executable directory)
 	$(info repo id: ${git_repository_id})
 	$(info branch: ${GIT_BRANCH})
-	ls -l ${CURRENT_DIR}/_output/bin
 	$(info Build the docker image)
-	podman build --quiet --no-cache --tag mcad-controller:${TAG} -f ${CURRENT_DIR}/deployment/Dockerfile.both  ${CURRENT_DIR}/_output/bin
+ifeq ($(strip $(GO_BUILD_ARGS)),)
+	podman build --quiet --no-cache --tag mcad-controller:${TAG} -f ${CURRENT_DIR}/Dockerfile  ${CURRENT_DIR}
+else
+	podman build --no-cache --tag mcad-controller:${TAG} --build-arg GO_BUILD_ARGS=$(GO_BUILD_ARGS) -f ${CURRENT_DIR}/Dockerfile  ${CURRENT_DIR}
+endif	
 
 push-images: verify-tag-name
 ifeq ($(strip $(quay_repository)),)
-	$(info No registry information provide.  To push images to a docker registry please set)
+	$(info No registry information provided.  To push images to a docker registry please set)
 	$(info environment variables: quay_repository, quay_token, and quay_id.  Environment)
 	$(info variables do not need to be set for github Travis CICD.)
 else
@@ -94,7 +117,7 @@ run-test:
 	$(info Running unit tests...)
 	hack/make-rules/test.sh $(WHAT) $(TESTS)
 
-run-e2e: mcad-controller verify-tag-name
+run-e2e: verify-tag-name
 ifeq ($(strip $(quay_repository)),)
 	echo "Running e2e with MCAD local image: mcad-controller ${TAG} IfNotPresent."
 	hack/run-e2e-kind.sh mcad-controller ${TAG} IfNotPresent
@@ -103,13 +126,8 @@ else
 	hack/run-e2e-kind.sh ${quay_repository}/mcad-controller ${TAG}
 endif
 
-mcad-controller-private: init generate-code
-	$(info Compiling controller)
-	CGO_ENABLED=0 GOARCH=amd64 GOPRIVATE=github.ibm.com/* go build -tags private -modfile ./private.mod -o ${BIN_DIR}/mcad-controller ./cmd/kar-controllers/
-
 coverage:
 #	KUBE_COVER=y hack/make-rules/test.sh $(WHAT) $(TESTS)
 
 clean:
 	rm -rf _output/
-	rm -f mcad-controllers

README.md

@@ -1,7 +1,7 @@
 Multi-Cluster App Dispatcher
 ==
 
-The `multi-cluster-app-dispatcher` is a Kubernetes controller providing mechanisms for applications to manage batch jobs in a single or mult-cluster environment.
+The `multi-cluster-app-dispatcher` is a Kubernetes controller providing mechanisms for applications to manage batch jobs in a single or multi-cluster environment.
 
 The `multi-cluster-app-dispatcher` (`MCAD`) controller is capable of (i) providing an abstraction for wrapping all resources of the job/application and treating them holistically, (ii) queuing job/application creation requests and applying different queuing policies, e.g., First In First Out, Priority, (iii) dispatching the job to one of multiple clusters, where a `MCAD` queuing agent runs, using configurable dispatch policies, and (iv) auto-scaling pod sets, balancing job demands and cluster availability (future work).