docs: add instructions for vX.Y helm charts

Signed-off-by: André Martins <andre@cilium.io>

.github/ISSUE_TEMPLATE/release_template.md

@@ -42,7 +42,8 @@ assignees: ''
   - [operator](https://hub.docker.com/repository/docker/cilium/operator/builds)
   - [docker-plugin](https://hub.docker.com/repository/docker/cilium/docker-plugin/builds)
 - [ ] Create helm charts artifacts in [Cilium charts] repository using
-      [cilium helm release tool] & push to repository
+      [cilium helm release tool] for both the `vX.Y.Z` release and `vX.Y` branch
+      & push to repository
 - [ ] Run sanity check of Helm install using connectivity-check script.
       Suggested approach: Follow the full [GKE getting started guide].
 - [ ] [Create a release] for the new tag `vX.Y.Z`, using the release notes

Documentation/contributing/release/stable.rst

@@ -148,6 +148,25 @@ If you intent to release a new feature release, see the
       ./prepare_artifacts.sh /path/to/cilium/repository/checked/out/to/release/commit
       git push
 
+#. Prepare Helm changes using the `Cilium Helm Charts Repository <https://github.com/cilium/charts/>`_
+   for the vX.Y helm charts, and push the changes into that repository (not the main cilium repository):
+
+   In the ``cilium/cilium`` repository:
+
+   #. ``git checkout vx.y -b vx.z-dev``
+   #. Change the ``VERSION`` file to ``x.y-dev``
+   #. Run ``make -C install/kubernetes``
+
+   In the ``cilium/charts`` repository:
+
+   ::
+
+      ./prepare_artifacts.sh /path/to/cilium/repository/checked/out/to/release/commit
+      git push
+
+   After pushing you can revert all the changes made in the local branch
+   ``x.y-dev`` from ``cilium/cilium``.
+
 #. Announce the release in the ``#general`` channel on Slack. Sample text:
 
    ::

Documentation/spelling_wordlist.txt

@@ -678,6 +678,7 @@ userspace
 uuid
 vCPU
 vCPUs
+vX
 validator
 verifier
 vers

install/kubernetes/Makefile

@@ -13,7 +13,7 @@ CILIUM_VALUES := "$(CILIUM_CHARTS)/values.yaml" "$(CILIUM_CHARTS)/charts/hubble-
 
 VERSION_REGEX := '[0-9]\+\.[0-9]\+\.[0-9]\+.*'
 LATEST_VERSION_REGEX := '[0-9]\+\.[0-9]\+\.90'
-DEV_VERSION_REGEX := '[0-9]\+\.[0-9]\+\.[0-9]\+-dev'
+DEV_VERSION_REGEX := '[0-9]\+\.[0-9]\+-dev'
 CILIUM_CHART_REGEX := '\([vV]ersion:\) '$(VERSION_REGEX)
 CILIUM_TAG_REGEX := '\(tag:\) \(v'$(VERSION_REGEX)'\|latest\)'
 CILIUM_PULLPOLICY_REGEX := '\([pP]ullPolicy:\) .*'
@@ -43,8 +43,7 @@ update-versions:
 			sed -i 's/'$(CILIUM_TAG_REGEX)'/\1 latest/' $$chart;				\
 			sed -i 's/'$(CILIUM_PULLPOLICY_REGEX)'/\1 Always/' $$chart;			\
 		elif echo $(VERSION) | grep -q $(DEV_VERSION_REGEX); then				\
-			DEV_BRANCH=$$(echo $(VERSION) | sed 's/-dev//')					\
-			sed -i 's/'$(CILIUM_TAG_REGEX)'/\1 $(DEV_BRANCH)/' $$chart;			\
+			sed -i 's/'$(CILIUM_TAG_REGEX)'/\1 v$(subst -dev,,$(VERSION))/' $$chart;	\
 			sed -i 's/'$(CILIUM_PULLPOLICY_REGEX)'/\1 Always/' $$chart;			\
 		else											\
 			sed -i 's/'$(CILIUM_TAG_REGEX)'/\1 v$(VERSION)/' $$chart;			\