Consolidate v part of version tag in the Chart metadata (#284)

Instead of repeating `v` thing here and there - put in the single place as it introduced multiple issues already Signed-off-by: Yury Tsarev <[email protected]>
k8gb-io · Feb 5, 2021 · 881de5f · 881de5f
1 parent aaed6f9
commit 881de5f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ PWD ?=  $(shell pwd)
 VERSION ?= $(shell helm show chart chart/k8gb/|awk '/appVersion:/ {print $$2}')
 
 # image URL to use all building/pushing image targets
-IMG ?= $(REPO):v$(VERSION)
+IMG ?= $(REPO):$(VERSION)
 
 # default bundle image tag
 BUNDLE_IMG ?= controller-bundle:$(VERSION)
@@ -110,8 +110,8 @@ deploy-full-local-setup: ## Deploy full local multicluster setup
 deploy-to-AbsaOSS-k3d-action:
 	@echo "\n$(YELLOW)build k8gb docker and push to registry $(NC)"
 	docker build . -t k8gb:$(COMMIT_HASH)
-	docker tag k8gb:$(COMMIT_HASH) $(GITACTION_IMAGE_REPO):v$(COMMIT_HASH)
-	docker push $(GITACTION_IMAGE_REPO):v$(COMMIT_HASH)
+	docker tag k8gb:$(COMMIT_HASH) $(GITACTION_IMAGE_REPO):$(COMMIT_HASH)
+	docker push $(GITACTION_IMAGE_REPO):$(COMMIT_HASH)
 
 	@echo "\n$(YELLOW)Change version in Chart.yaml $(CYAN) $(VERSION) to $(COMMIT_HASH)$(NC)"
 	sed -i "s/$(VERSION)/$(COMMIT_HASH)/g" chart/k8gb/Chart.yaml

diff --git a/chart/k8gb/Chart.yaml b/chart/k8gb/Chart.yaml
@@ -13,9 +13,9 @@ annotations:
 
 type: application
 
-version: 0.7.4
+version: v0.7.4
 
-appVersion: 0.7.4
+appVersion: v0.7.4
 
 dependencies:
   - name: coredns

diff --git a/chart/k8gb/templates/operator.yaml b/chart/k8gb/templates/operator.yaml
@@ -26,7 +26,7 @@ spec:
       serviceAccountName: k8gb
       containers:
         - name: k8gb
-          image: {{ .Values.k8gb.imageRepo }}:v{{ .Values.k8gb.imageTag | default .Chart.AppVersion }}
+          image: {{ .Values.k8gb.imageRepo }}:{{ .Values.k8gb.imageTag | default .Chart.AppVersion }}
           imagePullPolicy: Always
           securityContext:
             runAsUser: 1000