Config cs version in helm chart.yaml

Signed-off-by: YuChen <[email protected]>

Author: YCShen1010

Makefile

@@ -38,6 +38,7 @@ VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
 RELEASE_VERSION ?= $(shell cat ./version/version.go | grep "Version =" | awk '{ print $$3}' | tr -d '"')
 PREVIOUS_VERSION := 3.23.0
 LATEST_VERSION ?= latest
+DESCRIPTION ?= "A Helm chart for the IBM Common Service Operator"
 
 LOCAL_OS := $(shell uname)
 ifeq ($(LOCAL_OS),Linux)
@@ -255,7 +256,7 @@ deploy-dryrun: manifests kustomize ## Deploy controller to the K8s cluster speci
 
 .PHONY: helm
 helm: deploy-dryrun kustohelmize
-	$(KUSTOHELMIZE) create --from=config/ibm-common-service-operator.yaml generate-helm/ibm-common-service-operator
+	$(KUSTOHELMIZE) create --from=config/ibm-common-service-operator.yaml generate-helm/ibm-common-service-operator --version=$(RELEASE_VERSION) --app-version=$(RELEASE_VERSION) --description=$(DESCRIPTION)
 	helm lint generate-helm/ibm-common-service-operator
 	bash scripts/restructure_helm.sh
 	helm lint helm

helm-cluster-scoped/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: ibm-common-service-operator
-description: A Helm chart for Kubernetes
+description: A Helm chart for the IBM Common Service Operator
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 4.11.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.16.0"
+appVersion: "4.11.0"

helm/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: ibm-common-service-operator
-description: A Helm chart for Kubernetes
+description: A Helm chart for the IBM Common Service Operator
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 4.11.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.16.0"
+appVersion: "4.11.0"

scripts/restructure_helm.sh

@@ -68,7 +68,6 @@ cp $HELM_SRC_DIR/crds/* $CLUSTER_SCOPED_DIR/templates/crds.yaml
 # Todo: rest of resources
 
 # Copy Helm values, Chart.yaml and helper.tpl
-#sed -i -e "s/^version:.*/version: $CHART_VERSION/" -e "s/^appVersion:.*/appVersion: $CHART_VERSION/" $HELM_DIR/Chart.yaml
 for dir in $HELM_DIR $CLUSTER_SCOPED_DIR; do cp $HELM_SRC_DIR/{values.yaml,Chart.yaml} "$dir/"; done
 for dir in $HELM_DIR $CLUSTER_SCOPED_DIR; do cp $HELM_SRC_DIR/templates/_helpers.tpl "$dir/templates/"; done