Make the helm chart version follow the Calico version (projectcalico#…

…5163)

Makefile

@@ -84,7 +84,9 @@ _includes/charts/%/values.yaml: _plugins/values.rb _plugins/helm.rb _data/versio
 # Note that helm requires strict semantic versioning, so we use v0.0 to represent 'master'.
 ifdef RELEASE_CHART
 # the presence of RELEASE_CHART indicates we're trying to cut an official chart release.
-chartVersion:=$(CALICO_VER)-$(CHART_RELEASE)
+# Helm charts will be built with the chart version matching the corresponding Calico version.
+# Any functional changes to the helm chart will require a patch release of Calico.
+chartVersion:=$(CALICO_VER)
 appVersion:=$(CALICO_VER)
 else
 # otherwise, it's a nightly build.
@@ -105,6 +107,9 @@ chart/%: _includes/charts/%/values.yaml bin/helm3
 	--destination ./bin/ \
 	--version $(chartVersion) \
 	--app-version $(appVersion)
+	# The actual chart bundle will include a chart release version appended as a semver
+	# prerelease version in order to differentiate MINOR semantic issues caused by releasing.
+	mv ./bin/$(@F)-$(chartVersion).tgz ./bin/$(@F)-$(chartVersion)-$(CHART_RELEASE).tgz
 
 serve: bin/helm
 	# We have to override JEKYLL_DOCKER_TAG which is usually set to 'pages'.
@@ -401,7 +406,9 @@ release-publish: release-prereqs $(UPLOAD_DIR)
 	@echo "  https://github.com/projectcalico/calico/releases/tag/$(CALICO_VER)"
 	@echo ""
 
-## Kicks semaphore job which syncs github released helm charts with helm index file
+## Kicks semaphore job which syncs github released helm charts with helm index file.
+## The helm index will point to the latest helm chart release for that Calico release
+## (in case there are multiple charts).
 .PHONY: helm-index
 helm-index:
 	@echo "Triggering semaphore workflow to update helm index."

getting-started/kubernetes/helm.md

@@ -49,7 +49,7 @@ echo '{installation.kubernetesProvider: EKS}' > values.yaml
 ```
 1. Add any other customizations you require to `values.yaml`.  You might like to refer to the [helm docs](https://helm.sh/docs/) or run 
    ```
-   helm show values projectcalico/tigera-operator --version {{site.data.versions[0].title}}-{{site.data.versions[0].chart.version}}
+   helm show values projectcalico/tigera-operator --version {{site.data.versions[0].title}}
    ``` 
    to see the values that can be customized in the chart.
 
@@ -58,11 +58,11 @@ echo '{installation.kubernetesProvider: EKS}' > values.yaml
 1. Install the Tigera {{site.prodname}} operator and custom resource definitions using the Helm chart:
 
    ```
-   helm install {{site.prodname | downcase}} projectcalico/tigera-operator --version {{site.data.versions[0].title}}-{{site.data.versions[0].chart.version}}
+   helm install {{site.prodname | downcase}} projectcalico/tigera-operator --version {{site.data.versions[0].title}}
    ```
    or if you created a `values.yaml` above:
    ```
-   helm install {{site.prodname | downcase}} projectcalico/tigera-operator --version {{site.data.versions[0].title}}-{{site.data.versions[0].chart.version}} -f values.yaml
+   helm install {{site.prodname | downcase}} projectcalico/tigera-operator --version {{site.data.versions[0].title}} -f values.yaml
    ```
 
 1. Confirm that all of the pods are running with the following command.