From: Dileep Ranganathan <dileep.ranganathan@intel.com>
Date: Thu, 30 May 2019 18:57:01 +0000 (-0700)
Subject: Collectd operator utilties
X-Git-Tag: 1.5.0~78
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=31802660dfe74a8671ae29789f0018f0f887ea1a

Collectd operator utilties

Made changes to Makefile, added help and clean

Issue-ID: ONAPARC-461
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Change-Id: I2f99b26d415e411e6e7ca847ea082dcbf39698f4
---

diff --git a/vnfs/DAaaS/collectd-operator/Makefile b/vnfs/DAaaS/collectd-operator/Makefile
index 2d9a4cf6..c3c11f5e 100644
--- a/vnfs/DAaaS/collectd-operator/Makefile
+++ b/vnfs/DAaaS/collectd-operator/Makefile
@@ -7,17 +7,22 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+# Common
+VERSION := $(shell git describe --tags)
+BUILD := $(shell git rev-parse --short HEAD)
+PROJECTNAME := $(shell basename "$(PWD)")
+
 GOPATH := $(shell realpath "$(PWD)/../../../../../")
 COP = ${PWD}/build/_output/bin/collectd-operator
-IMAGE_NAME = dcr.cluster.local:31976/collectd-operator:latest
+IMAGE_NAME = dcr.cluster.local/collectd-operator:latest
 
 export GOPATH ...
 export GO111MODULE=on
 
 .PHONY: clean plugins
 
-
-all: clean
+## all: Generate the k8s and openapi artifacts using operator-sdk
+all: clean vendor
 	GOOS=linux GOARCH=amd64
 	operator-sdk generate k8s --verbose
 	operator-sdk generate openapi --verbose
@@ -28,9 +33,11 @@ all: clean
 # no need to create a static binary with additional flags. However, for generating binary, additional build flags are necessary. This if used with
 # mock plugin errors out for unit tests. So the seperation avoids the error.
 
+## build: clean the
 build: clean test cover
 deploy: build publish
-
+vendor:
+	@go mod vendor
 publish:
 	@docker push ${IMAGE_NAME}
 .PHONY: test
@@ -50,3 +57,14 @@ clean:
 cover:
 	@go test ./... -coverprofile=coverage.out
 	@go tool cover -html=coverage.out -o coverage.html
+
+.PHONY: help
+## help: Print help message
+help: Makefile
+	@echo
+	@echo " Requires -\\t Operator SDK v0.8.0+, go1.12.5+"
+	@echo
+	@echo " Choose a command run in "$(PROJECTNAME)":"
+	@echo
+	@sed -n 's/^## //p' $< | column -t -s ':' |  sed -e 's/^/ /'
+	@echo
\ No newline at end of file