Updated the go version in go.mod (#316)

* Updated the go version in go.mod
Ran `go mod tidy`
Updated travis.yml
Deleted staled code, disabled the quota manager in the controller.

* Added travis changes.

* Removed linter install
Ported changes to .travis.yml from quota-management-branch

* Removed linter install
Ported changes to .travis.yml from quota-management-branch

* Downgraded go to version 1.18 to allow for use of ubi images.

* Added use of docker builder using ubi8 images
Makefile updates

* Cleaned up the obsolete build scripts
Updated documentation
Minor changes to makefile

* Small fix to the docker file.

* More updates to go.mod to fix vulnerabilities

* Removed text files.

* Yet another text file removal

* Small fix to address PR review comments.

Author: z103cb

.travis.yml

@@ -9,18 +9,18 @@ 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
 
 script:
-#  - make
+  - BLUE='\033[34m'
   - make mcad-controller
   - make run-test
   # Process 'make images' when NOT a pull request
@@ -29,4 +29,11 @@ script:
   - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then unset quay_repository && make images; fi'
   # Process 'make push-images' when NOT a pull request
   - 'if [ "$TRAVIS_PULL_REQUEST"  = "false" ]; then make push-images; fi'
-  - travis_wait 80 make run-e2e
+  # Run the e2e and handle Travis condition where Travis fails on no output for 10 minutes.   No output for 10 minutes
+  # is fine for our test cases that waits for 10 minutes before requeuing a job.  The other workaround was to
+  # use 'travis_wait n' which unfortunately does not stream output until the very end so monitoring the Travis log 
+  # during runtime is not possible.
+  - make run-e2e &
+  - PID=$! && echo -e "${BLUE}make run e2e pid=${PID}"
+  - while [ -e /proc/${PID} ]; do echo -n "."  && sleep 30; done
+  - wait ${PID}

deployment/Dockerfile.both renamed to Dockerfile

@@ -1,6 +1,19 @@
+FROM  registry.access.redhat.com/ubi8/go-toolset:1.18.10-1 AS BUILDER
+USER root
+WORKDIR /workdir
+
+COPY Makefile Makefile
+COPY go.mod go.mod
+COPY go.sum go.sum
+COPY cmd cmd
+COPY pkg pkg
+COPY hack hack
+
+RUN make mcad-controller
+
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 
-ADD mcad-controller /usr/local/bin
+COPY --from=BUILDER /workdir/_output/bin/mcad-controller /usr/local/bin
 
 RUN true \
     && microdnf update \

Makefile

@@ -27,7 +27,7 @@ TAG:=${TAG}${RELEASE_VER}
 # Build the controler executalbe for use in docker image build
 mcad-controller: init generate-code
 	$(info Compiling controller)
-	CGO_ENABLED=0 GOOS="linux" go build -o ${BIN_DIR}/mcad-controller ./cmd/kar-controllers/
+	CGO_ENABLED=0 go build -o ${BIN_DIR}/mcad-controller ./cmd/kar-controllers/
 
 print-global-variables:
 	$(info "---")
@@ -56,21 +56,20 @@ generate-code:
 	$(info Generating deepcopy...)
 	${BIN_DIR}/deepcopy-gen -i ./pkg/apis/controller/v1beta1/ -O zz_generated.deepcopy 
 
-images: verify-tag-name mcad-controller
+images: verify-tag-name 
 	$(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
+	docker build --quiet --no-cache --tag mcad-controller:${TAG} -f ${CURRENT_DIR}/Dockerfile  ${CURRENT_DIR}
 
-images-podman: verify-tag-name mcad-controller
+images-podman: verify-tag-name
 	$(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
+	podman build --quiet --no-cache --tag mcad-controller:${TAG} -f ${CURRENT_DIR}/Dockerfile  ${CURRENT_DIR}
 
 push-images: verify-tag-name
 ifeq ($(strip $(quay_repository)),)
@@ -95,7 +94,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
@@ -104,12 +103,10 @@ 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/
 
 # Build the controller executable for use on the local host and using local build args
-# the default for local build args is `-race` to turn race detection
+# the default for local build args is `-race` to turn race detection, this is not to be used 
+# inside the docker containers.
 mcad-controller-local: init generate-code
 	$(info Compiling controller)
 	go build ${LOCAL_BUILD_ARGS} -o ${BIN_DIR}/mcad-controller-local ./cmd/kar-controllers/
@@ -119,4 +116,3 @@ coverage:
 
 clean:
 	rm -rf _output/
-	rm -f mcad-controllers

deployment/build-inside-container-private.sh

@@ -91,69 +91,47 @@ From the root directory of the repository:
 ```bash
 # With docker daemon running
 multi-cluster-app-dispatcher % make images
-
 ....
-
-# output from a local branch, MacOS build, local file names replaced with XXXXXXXXXX
+# output from main branch, MacOS build, local file names replaced with XXXXXXXXXX
 "---"
 "MAKE GLOBAL VARIABLES:"
 "  "BIN_DIR="_output/bin"
-"  "GIT_BRANCH="local_e2e_test"
+"  "GIT_BRANCH="main"
 "  "RELEASE_VER="v1.29.55"
-"  "TAG="local_e2e_test-v1.29.55"
+"  "TAG="main-v1.29.55"
 "---"
 # Check for invalid tag name
-t=local_e2e_test-v1.29.55 && [ ${#t} -le 128 ] || { echo "Target name $t has 128 or more chars"; false; }
-mkdir -p _output/bin
-Compiling deepcopy-gen...
-Generating deepcopy...
-go build -o _output/bin/deepcopy-gen ./cmd/deepcopy-gen/
-_output/bin/deepcopy-gen -i ./pkg/apis/controller/v1beta1/ -O zz_generated.deepcopy 
-Compiling controller
-CGO_ENABLED=0 GOOS="linux" go build -o _output/bin/mcad-controller ./cmd/kar-controllers/
+t=main-v1.29.55 && [ ${#t} -le 128 ] || { echo "Target name $t has 128 or more chars"; false; }
 List executable directory
 repo id: 
-branch: local_e2e_test
+branch: main
 Build the docker image
-ls -l XXXXXXXXXXXX/multi-cluster-app-dispatcher/_output/bin
-total 268768
--rwxr-xr-x  1 XXXXX  staff   8238498 Apr  4 12:46 deepcopy-gen
--rwxr-xr-x  1 XXXXX  staff  57584808 Apr  4 12:47 mcad-controller
-docker build --quiet --no-cache --tag mcad-controller:local_e2e_test-v1.29.55 -f XXXXXXXX/multi-cluster-app-dispatcher/deployment/Dockerfile.both  XXXXXX/multi-cluster-app-dispatcher/_output/bin
-sha256:3b4f314b06674f6b52d6a5d77ad1d3d9cebf8fa94a9f80026b02813689c3289d
+docker build --quiet --no-cache --tag mcad-controller:main-v1.29.55 -f XXXXXXXXXX/multi-cluster-app-dispatcher/Dockerfile  XXXXXXXXXX/multi-cluster-app-dispatcher
+sha256:6871c150701280abc29baa14aa639791cefb9ba4b61177ab4faf5a43bdfcc4e4
 
 #Using podman
 make images-podman
-
 ....
-
-# output from a local branch, MacOS build, local file names replaced with XXXXXXXXXX
+# output from a main branch, MacOS build, local file names replaced with XXXXXXXXXX
 "---"
 "MAKE GLOBAL VARIABLES:"
 "  "BIN_DIR="_output/bin"
-"  "GIT_BRANCH="local_e2e_test"
+"  "GIT_BRANCH="main"
 "  "RELEASE_VER="v1.29.55"
-"  "TAG="local_e2e_test-v1.29.55"
+"  "TAG="main-v1.29.55"
 "---"
 # Check for invalid tag name
-t=local_e2e_test-v1.29.55 && [ ${#t} -le 128 ] || { echo "Target name $t has 128 or more chars"; false; }
-mkdir -p _output/bin
-Compiling deepcopy-gen...
-Generating deepcopy...
-go build -o _output/bin/deepcopy-gen ./cmd/deepcopy-gen/
-_output/bin/deepcopy-gen -i ./pkg/apis/controller/v1beta1/ -O zz_generated.deepcopy 
-Compiling controller
-CGO_ENABLED=0 GOOS="linux" go build -o _output/bin/mcad-controller ./cmd/kar-controllers/
+t=main-v1.29.55 && [ ${#t} -le 128 ] || { echo "Target name $t has 128 or more chars"; false; }
 List executable directory
 repo id: 
-branch: local_e2e_test
+branch: main
 Build the docker image
 ls -l XXXXXXXXXX/multi-cluster-app-dispatcher/_output/bin
-total 128568
--rwxr-xr-x  1 XXXXXXXX  staff   8238498 Apr  4 12:53 deepcopy-gen
--rwxr-xr-x  1 XXXXXXXX  staff  57584808 Apr  4 12:53 mcad-controller
-podman build --quiet --no-cache --tag mcad-controller:local_e2e_test-v1.29.55 -f XXXXXXXXXX/multi-cluster-app-dispatcher/deployment/Dockerfile.both  XXXXXXXXXX/multi-cluster-app-dispatcher/_output/bin
-7553c702e5238920f44cba7303d1ff111aca1722e7e3ed4d49afbafa165fc3e3
+total 130144
+-rwxr-xr-x  1 laurentiu.bradin  staff   8238498 Apr  6 15:19 deepcopy-gen
+-rwxr-xr-x  1 laurentiu.bradin  staff  58391090 Apr  6 15:19 mcad-controller
+podman build --quiet --no-cache --tag mcad-controller:issue_315_small_changes-v1.29.55 -f XXXXXXXXXX/multi-cluster-app-dispatcher/Dockerfile  XXXXXXXXXX/multi-cluster-app-dispatcher
+f784707e8982399ef7ef66e3d8a09b669e6deb17990d174400338813fb13c505
 ```
 
 ### Push the Multi-Cluster-App-Dispatcher Image to an Image Repository
@@ -176,7 +154,7 @@ Refer to [deployment](../deploy/deployment.md) on how to deploy the `multi-clust
 
 ## 3. Running e2e tests locally
 
-When running e2e tests, is recommended you restrict the `docker` daemon [cpu and memory resources](https://docs.docker.com/config/containers/resource_constraints/). The recomended settings are:
+When running e2e tests, is recommended you restrict the `docker` daemon [cpu and memory resources](https://docs.docker.com/config/containers/resource_constraints/). The recommended settings are:
 
 * CPU: 2
 * Memory: 8 GB
@@ -185,5 +163,5 @@ From the root directory of the repository:
 
 ```bash
 # With docker daemon running
-multi-cluster-app-dispatcher % make run-e2e:
+multi-cluster-app-dispatcher % make run-e2e
 ```