X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vnfs%2FDAaaS%2Fmicroservices%2Fcollectd-operator%2FMakefile;h=c09f4c24cf3c6d3b2a4a4979f0ed485c706a86e2;hb=c3ef7c3f40f6aa4a14a98301ae12bfa11b1a12c3;hp=1c9311ea4c89a257a5cd71f16ea98fd80b765d25;hpb=83714f905f0483a84b8af8132a14ea1464bd0355;p=demo.git

diff --git a/vnfs/DAaaS/microservices/collectd-operator/Makefile b/vnfs/DAaaS/microservices/collectd-operator/Makefile
index 1c9311ea..c09f4c24 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
@@ -41,14 +41,14 @@ all: build test cover
 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} -mod=vendor demo/vnfs/DAaaS/microservices/collectd-operator/cmd/manager
+	@go build -o ${COP_LOCAL} collectd-operator/cmd/manager
 
 ## deploy: Build Dockerfile and publish to repository
 deploy: build publish
-## vendor: Build the vendor module
-vendor:
-	@go mod vendor
+
 ## publish: Push docker image to repository
 publish:
 	@docker push ${IMAGE_NAME}
@@ -66,7 +66,7 @@ clean:
 	@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