Issue 156: Including operator base version in Makefile (#157)

* Issue 156: Including operator base version in Makefile Signed-off-by: SrishT <[email protected]> * Issue 156: Addressing review comments Signed-off-by: SrishT <[email protected]> Co-authored-by: SrishT <[email protected]>
pravega · Jul 13, 2021 · 2908ab4 · 2908ab4
1 parent 007f45e
commit 2908ab4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -10,8 +10,10 @@ SHELL=/bin/bash -o pipefail
 
 PROJECT_NAME=bookkeeper-operator
 REPO=pravega/$(PROJECT_NAME)
-VERSION=$(shell git describe --always --tags --dirty | sed "s/\(.*\)-g`git rev-parse --short HEAD`/\1/")
+BASE_VERSION=0.1.6
+ID=$(shell git rev-list HEAD --count)
 GIT_SHA=$(shell git rev-parse --short HEAD)
+VERSION=$(BASE_VERSION)-$(ID)-$(GIT_SHA)
 GOOS=linux
 GOARCH=amd64
 TEST_REPO=testbkop/$(PROJECT_NAME)

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -16,7 +16,7 @@ spec:
       serviceAccountName: bookkeeper-operator
       containers:
         - name: bookkeeper-operator
-          image: pravega/bookkeeper-operator:0.1.4
+          image: pravega/bookkeeper-operator:0.1.5
           ports:
           - containerPort: 60000
             name: metrics