build: version the bundle/CSV the same as the tag of the container-images

When a release is made, the git-tag is used for the version of the
container-images. It seems that ODF-Operator assumes the tag of the
container-image matches what is used as a version of the bundle/CSV.

There is no hard requirement that these versions are the same, it is
just an assumption of ODF-Operator. However, it is the first operator
that deploys CSI-Addons, and changing the operator seems more complex
than versioning csi-addons differently.

The default version in csi-addons.clusterserviceversion.yaml has now
been set to 0.1.1, the latest git-tag that was published.

Fixes: csi-addons#82
Signed-off-by: Niels de Vos <ndevos@redhat.com>

Author: nixpanic

Makefile

@@ -7,8 +7,12 @@ BUNDLE_IMG ?= quay.io/csiaddons/k8s-bundle
 # set TAG to a release for consumption in the bundle
 TAG ?= latest
 
-# version of the package inside the bundle, can be different from the TAG
-BUNDLE_VERSION ?= 0.0.1
+# The default version of the bundle (CSV) can be found in
+# config/manifests/bases/csi-addons.clusterserviceversion.yaml . When tagging a
+# release, the bundle will be versioned with the same value as well.
+ifneq ($(TAG),latest)
+BUNDLE_VERSION ?= --version=$(shell sed s/^v// <<< $(TAG))
+endif
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.23
@@ -55,7 +59,7 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 .PHONY: bundle
 bundle: kustomize operator-sdk
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(CONTROLLER_IMG):$(TAG)
-	$(KUSTOMIZE) build config/default | $(OPERATOR_SDK) generate bundle --manifests --metadata --package=csi-addons --version=$(BUNDLE_VERSION)
+	$(KUSTOMIZE) build config/default | $(OPERATOR_SDK) generate bundle --manifests --metadata --package=csi-addons $(BUNDLE_VERSION)
 	mkdir -p ./bundle/tests/scorecard && $(KUSTOMIZE) build config/scorecard --output=./bundle/tests/scorecard/config.yaml
 
 .PHONY: generate

config/manifests/bases/csi-addons.clusterserviceversion.yaml

@@ -4,7 +4,7 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
-  name: csi-addons.v0.0.0
+  name: csi-addons.v0.1.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -61,4 +61,4 @@ spec:
   maturity: alpha
   provider:
     name: CSI Addons Community
-  version: 0.0.0
+  version: 0.1.1