From 48e1f3cc67db81ee74be2ebafd29832e746e14c8 Mon Sep 17 00:00:00 2001 From: Diana Arroyo Date: Sun, 20 Dec 2020 09:36:14 -0500 Subject: [PATCH 1/5] Changes to support new image tag. Signed-off-by: Diana Arroyo --- CONTROLLER_VERSION | 2 +- Makefile | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CONTROLLER_VERSION b/CONTROLLER_VERSION index 412114252..cad6e08a2 100644 --- a/CONTROLLER_VERSION +++ b/CONTROLLER_VERSION @@ -1 +1 @@ -1.29.2 +1.29.3 diff --git a/Makefile b/Makefile index e549e1e0e..21c5f7d50 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,7 @@ CAT_CMD=$(if $(filter $(OS),Windows_NT),type,cat) VERSION_FILE=./CONTROLLER_VERSION RELEASE_VER=v$(shell $(CAT_CMD) $(VERSION_FILE)) CURRENT_DIR=$(shell pwd) -#MCAD_REGISTRY=$(shell docker ps --filter name=mcad-registry | grep -v NAME) -#LOCAL_HOST_NAME=localhost -#LOCAL_HOST_NAME=0.0.0.0 -#LOCAL_HOST_NAME=$(shell ifconfig en0 | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1') -#dockerhub_repository=${LOCAL_HOST_NAME}:5000 +GIT_BRANCH=$(git symbolic-ref --short HEAD 2>&1 | grep -v fatal) mcad-controller: init generate-code $(info Compiling controller) From c64fd65564790946328f80a93373626c7a554b47 Mon Sep 17 00:00:00 2001 From: Diana Arroyo Date: Sun, 20 Dec 2020 14:46:17 -0500 Subject: [PATCH 2/5] Changes to support new image tag. Signed-off-by: Diana Arroyo --- Makefile | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 21c5f7d50..44e8b0092 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,19 @@ CAT_CMD=$(if $(filter $(OS),Windows_NT),type,cat) VERSION_FILE=./CONTROLLER_VERSION RELEASE_VER=v$(shell $(CAT_CMD) $(VERSION_FILE)) CURRENT_DIR=$(shell pwd) -GIT_BRANCH=$(git symbolic-ref --short HEAD 2>&1 | grep -v fatal) +GIT_BRANCH=$(shell git symbolic-ref --short HEAD 2>&1 | grep -v fatal) +TAG:=$(shell echo "") +# Check for git repository id sent by Travis-CI +ifneq ($(strip $(git_repository_id)),) + TAG:=${TAG}${git_repository_id}- +endif + +# Check for current branch name +ifneq ($(strip $(GIT_BRANCH)),) + TAG:=${TAG}${GIT_BRANCH}- +endif +TAG:=${TAG}${RELEASE_VER} + mcad-controller: init generate-code $(info Compiling controller) @@ -17,19 +29,25 @@ verify: generate-code init: mkdir -p ${BIN_DIR} +verify-tag-name: + # 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/ $(info Generating deepcopy...) ${BIN_DIR}/deepcopy-gen -i ./pkg/apis/controller/v1alpha1/ -O zz_generated.deepcopy -images: +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:${RELEASE_VER} -f ${CURRENT_DIR}/deployment/Dockerfile.both ${CURRENT_DIR}/_output/bin + docker build --quiet --no-cache --tag mcad-controller:${TAG} -f ${CURRENT_DIR}/deployment/Dockerfile.both ${CURRENT_DIR}/_output/bin -push-images: +push-images: verify-tag-name ifeq ($(strip $(dockerhub_repository)),) $(info No registry information provide. To push images to a docker registry please set) $(info environment variables: dockerhub_repository, dockerhub_token, and dockerhub_id. Environment) @@ -38,22 +56,22 @@ else $(info Log into dockerhub) docker login -u ${dockerhub_id} --password ${dockerhub_token} $(info Tag the latest image) - docker tag mcad-controller:${RELEASE_VER} ${dockerhub_repository}/mcad-controller:${RELEASE_VER} + docker tag mcad-controller:${TAG} ${dockerhub_repository}/mcad-controller:${TAG} $(info Push the docker image to registry) - docker push ${dockerhub_repository}/mcad-controller:${RELEASE_VER} + docker push ${dockerhub_repository}/mcad-controller:${TAG} endif run-test: $(info Running unit tests...) hack/make-rules/test.sh $(WHAT) $(TESTS) -run-e2e: mcad-controller +run-e2e: mcad-controller verify-tag-name ifeq ($(strip $(dockerhub_repository)),) - echo "Running e2e with MCAD local image: mcad-controller ${RELEASE_VER} IfNotPresent." - hack/run-e2e-kind.sh mcad-controller ${RELEASE_VER} IfNotPresent + echo "Running e2e with MCAD local image: mcad-controller ${TAG} IfNotPresent." + hack/run-e2e-kind.sh mcad-controller ${TAG} IfNotPresent else - echo "Running e2e with MCAD registry image image: ${dockerhub_repository}/mcad-controller ${RELEASE_VER}." - hack/run-e2e-kind.sh ${dockerhub_repository}/mcad-controller ${RELEASE_VER} + echo "Running e2e with MCAD registry image image: ${dockerhub_repository}/mcad-controller ${TAG}." + hack/run-e2e-kind.sh ${dockerhub_repository}/mcad-controller ${TAG} endif coverage: From 701461a760f24e451cbc6973c6fed42391b04b20 Mon Sep 17 00:00:00 2001 From: Diana Arroyo Date: Sun, 20 Dec 2020 15:29:31 -0500 Subject: [PATCH 3/5] Added debugging for tag variable.. Signed-off-by: Diana Arroyo --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 44e8b0092..4f1a67edd 100644 --- a/Makefile +++ b/Makefile @@ -16,11 +16,21 @@ ifneq ($(strip $(GIT_BRANCH)),) endif TAG:=${TAG}${RELEASE_VER} +.PHONY: print-global-variables mcad-controller: init generate-code $(info Compiling controller) CGO_ENABLED=0 GOARCH=amd64 go build -o ${BIN_DIR}/mcad-controller ./cmd/kar-controllers/ +print-global-variables: + $(info "---") + $(info "MAKE GLOBAL VARIABLES:") + $(info " "BIN_DIR="$(BIN_DIR)") + $(info " "GIT_BRANCH="$(GIT_BRANCH)") + $(info " "RELEASE_VER="$(RELEASE_VER)") + $(info " "TAG="$(TAG)") + $(info "---") + verify: generate-code # hack/verify-gofmt.sh # hack/verify-golint.sh @@ -29,7 +39,7 @@ verify: generate-code init: mkdir -p ${BIN_DIR} -verify-tag-name: +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; } From 5c5d6cde441f6b2f15c583b9167119463dc2d90c Mon Sep 17 00:00:00 2001 From: Diana Arroyo Date: Sun, 20 Dec 2020 15:56:44 -0500 Subject: [PATCH 4/5] Added check for Travis CI branch name. Signed-off-by: Diana Arroyo --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4f1a67edd..ffa7caafa 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,12 @@ CAT_CMD=$(if $(filter $(OS),Windows_NT),type,cat) 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) +GIT_BRANCH:=$(shell git symbolic-ref --short HEAD 2>&1 | grep -v fatal) +# Reset branch name if this a Travis CI environment +ifneq ($(strip $(TRAVIS_BRANCH)),) + GIT_BRANCH:=${TRAVIS_BRANCH} +endif + TAG:=$(shell echo "") # Check for git repository id sent by Travis-CI ifneq ($(strip $(git_repository_id)),) From c082c5e991f58bb67d5dc322b906ac0354629df0 Mon Sep 17 00:00:00 2001 From: Diana Arroyo Date: Wed, 23 Dec 2020 10:20:08 -0500 Subject: [PATCH 5/5] Upgrade Helm version to 1.17.0. Signed-off-by: Diana Arroyo --- CONTROLLER_VERSION | 2 +- hack/run-e2e-kind.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTROLLER_VERSION b/CONTROLLER_VERSION index cad6e08a2..93f9beed3 100644 --- a/CONTROLLER_VERSION +++ b/CONTROLLER_VERSION @@ -1 +1 @@ -1.29.3 +1.29.4 diff --git a/hack/run-e2e-kind.sh b/hack/run-e2e-kind.sh index c747f0e7c..b74c2f148 100755 --- a/hack/run-e2e-kind.sh +++ b/hack/run-e2e-kind.sh @@ -259,7 +259,7 @@ function kube-test-env-up { echo "Installing Helm Client..." curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get > install-helm.sh chmod u+x install-helm.sh - ./install-helm.sh --version v2.16.3 + ./install-helm.sh --version v2.17.0 # Start Helm Server echo "Installing Helm Server..."