X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vnfs%2FDAaaS%2Fmicroservices%2Fcollectd-operator%2FMakefile;h=9c023521c2c8c4847b0ae2d4fa3d7125f43eb5be;hb=d614d3d6cc1d40664215f79fc2c2f38af03a9996;hp=47810e02e0a905015c084019f786ef194b261ccd;hpb=e1e10b80cabc5d425aab3ef32460f8bbcb5bc957;p=demo.git

diff --git a/vnfs/DAaaS/microservices/collectd-operator/Makefile b/vnfs/DAaaS/microservices/collectd-operator/Makefile
index 47810e02..9c023521 100644
--- a/vnfs/DAaaS/microservices/collectd-operator/Makefile
+++ b/vnfs/DAaaS/microservices/collectd-operator/Makefile
@@ -12,23 +12,23 @@ VERSION := $(shell git describe --tags)
 BUILD := $(shell git rev-parse --short HEAD)
 PROJECTNAME := $(shell basename "$(PWD)")
 
-GOPATH := $(shell realpath "$(PWD)/../../../../../../")
+ROOTPATH := $(shell realpath "$(PWD)/../")
 COP := ${PWD}/build/_output/bin/collectd-operator
 COP_LOCAL := ${COP}-local
-IMAGE_NAME := dcr.cluster.local:32644/collectd-operator:latest
+ifndef IMAGE_NAME
+override IMAGE_NAME := dcr.cluster.local:32644/collectd-operator:latest
+endif
 
-export GOPATH ...
 export GO111MODULE=on
 
 .PHONY: clean plugins
 
 ## build: Generate the k8s and openapi artifacts using operator-sdk
-build: clean vendor
+build: clean format
 	GOOS=linux GOARCH=amd64
 	operator-sdk generate k8s --verbose
 	operator-sdk generate openapi --verbose
-	#@go build -o ${COP} -gcflags all=-trimpath=${GOPATH} -asmflags all=-trimpath=${GOPATH} -mod=vendor demo/vnfs/DAaaS/microservices/collectd-operator/cmd/manager
-	@go build -o ${COP_LOCAL} -mod=vendor demo/vnfs/DAaaS/microservices/collectd-operator/cmd/manager
+	@go build -o ${COP_LOCAL} collectd-operator/cmd/manager
 	@operator-sdk build ${IMAGE_NAME} --verbose
 
 # The following is done this way as each patch on CI runs build and each merge runs deploy. So for build we don't need to build binary and hence
@@ -37,25 +37,39 @@ build: clean vendor
 
 ## all: Delete the image, binary, complete build, test and run coverage
 all: build test cover
-deploy: build publish
-vendor:
-	@go mod vendor
+## debug: Build local binary for debugging
+debug:
+	@echo "Deleting ${COP_LOCAL} binary"
+	@rm -rf ${COP_LOCAL}
+	operator-sdk generate k8s --verbose
+	operator-sdk generate openapi --verbose
+	@echo "Building ${COP_LOCAL} binary"
+	@go build -o ${COP_LOCAL} collectd-operator/cmd/manager
+
+## deploy: Build Dockerfile and publish to repository
+deploy: build test publish
+
+## publish: Push docker image to repository
 publish:
 	@docker push ${IMAGE_NAME}
 .PHONY: test
+## test: run tests
 test: clean
 	@go test -v ./...
-
+## format: format source code
 format:
 	@go fmt ./...
 
+## clean: clean build artifacts, image, binary 
 clean:
 	@echo "Deleting the collectd-operator binary"
-	@rm -rf ${PWD}/build/_output/bin/collectd-operator
+	@rm -rf ${COP}
+	@rm -rf ${COP_LOCAL}
 	@echo "Deleting the collectd-operator docker image"
-	@docker rmi ${IMAGE_NAME}
+	@docker 2>/dev/null rmi ${IMAGE_NAME} | true
 
 .PHONY: cover
+## cover: run tests and generate coverage report
 cover:
 	@go test ./... -coverprofile=coverage.out
 	@go tool cover -html=coverage.out -o coverage.html
@@ -64,7 +78,7 @@ cover:
 ## help: Print help message
 help: Makefile
 	@echo
-	@echo " Requires -\\t Operator SDK v0.8.0+, go1.12.5+"
+	@echo " Requires Operator SDK v0.8.0+, go1.12.5+"
 	@echo
 	@echo " Choose a command run in "$(PROJECTNAME)":"
 	@echo