From 518d6aac91b9c7176c1407a158ad02b4a2b70078 Mon Sep 17 00:00:00 2001
From: Itay Grudev <itay.grudev@essentim.com>
Date: Wed, 21 Feb 2024 21:55:29 +0200
Subject: [PATCH] Bug Fix: New release templates were not backwards compatible

Signed-off-by: Itay Grudev <itay.grudev@essentim.com>
---
 .github/workflows/release-pr.yml      |  2 +-
 .github/workflows/release-publish.yml |  1 +
 RELEASE.md                            | 21 +++++++++++----------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
index 28fe4796a..dbc0fda12 100644
--- a/.github/workflows/release-pr.yml
+++ b/.github/workflows/release-pr.yml
@@ -6,7 +6,7 @@ name: release-pr
 on:
   push:
     branches:
-      - release/*
+      - release/*-v*
 
 permissions:
   pull-requests: write
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 891d78207..aad2dc592 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -37,6 +37,7 @@ jobs:
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CR_GENERATE_RELEASE_NOTES: true
+          CR_RELEASE_NAME_TEMPLATE: "{{ .Name }}-v{{ .Version }}"
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
diff --git a/RELEASE.md b/RELEASE.md
index 18111f24f..8baad7bcc 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -22,9 +22,9 @@ In order to create a new release of the `cloudnative-pg` chart, follow these ste
     ```bash
     NEW_VERSION="X.Y.Z"
     ```
-3. Create a branch named `release/cloudnative-pg-X.Y.Z` and switch to it:
+3. Create a branch named `release/cloudnative-pg-vX.Y.Z` and switch to it:
     ```bash
-    git checkout -b release/cluster-$NEW_VERSION
+    git checkout -b release/cloudnative-pg-v$NEW_VERSION
     ```
 4. Update the `.version` in the [Chart.yaml](./charts/cloudnative-pg/Chart.yaml) file to `"X.Y.Z"`
     ```bash
@@ -73,12 +73,13 @@ In order to create a new release of the `cloudnative-pg` chart, follow these ste
     ```bash
     git push --set-upstream origin release/cloudnative-pg-v$NEW_VERSION
     ```
-9. A PR named `Release cloudnative-pg-X.Y.Z` should be automatically created
+9. A PR named `Release cloudnative-pg-vX.Y.Z` should be automatically created
 10. Wait for all the checks to pass
 11. Two approvals are required in order to merge the PR, if you are a maintainer approve the PR yourself and ask for
     another approval, otherwise ask for two approvals directly.
-12. Merge the PR squashing all commits and **taking care to keep the commit message to be `Release cloudnative-pg-X.Y.Z`**
-13. A release `cloudnative-pg-X.Y.Z` should be automatically created by an action, which will then trigger the release 
+12. Merge the PR squashing all commits and **taking care to keep the commit message to be 
+    `Release cloudnative-pg-vX.Y.Z`**
+13. A release `cloudnative-pg-vX.Y.Z` should be automatically created by an action, which will then trigger the release 
     action. Verify they both are successful.
 14. Once done you should be able to run:
     ```bash
@@ -98,9 +99,9 @@ In order to create a new release of the `cluster` chart, follow these steps:
     ```bash
     NEW_VERSION="X.Y.Z"
     ```
-3. Create a branch: named `release/cluster-X.Y.Z` and switch to it
+3. Create a branch: named `release/cluster-vX.Y.Z` and switch to it
     ```bash
-    git checkout -b release/cluster-$NEW_VERSION
+    git checkout -b release/cluster-v$NEW_VERSION
     ```
 4. Update the `.version` in the [Chart.yaml](./charts/cluster/Chart.yaml) file to `"X.Y.Z"`
     ```bash
@@ -116,7 +117,7 @@ In order to create a new release of the `cluster` chart, follow these steps:
     ```
 7. Push the new branch
     ```bash
-    git push --set-upstream origin release/cloudnative-pg-v$NEW_VERSION
+    git push --set-upstream origin release/cluster-v$NEW_VERSION
     ```
 8. A PR should be automatically created
 9. Wait for all the checks to pass
@@ -124,8 +125,8 @@ In order to create a new release of the `cluster` chart, follow these steps:
     maintainer approve the PR yourself and ask for another approval, otherwise
     ask for two approvals directly.
 11. Merge the PR squashing all commits and **taking care to keep the commit
-    message to be `Release cluster-X.Y.Z`**
-12. A release `cluster-X.Y.Z` should be automatically created by an action, which will ten trigger the release action.
+    message to be `Release cluster-vX.Y.Z`**
+12. A release `cluster-vX.Y.Z` should be automatically created by an action, which will ten trigger the release action.
     Verify they both are successful.
 13. Once done you should be able to run:
     ```bash