Dev/4778 (#36)

NiccoloFei · Jun 24, 2024 · 3f3fdfb · 3f3fdfb
1 parent ae9a127
commit 3f3fdfb
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 39 deletions.
diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
@@ -18,7 +18,11 @@ jobs:
         name: Get tag
         run: |
           TAG=${GITHUB_REF##*/}
-          DEST=$(echo ${TAG#v} | awk -F '[.]' '{print "release-"$1"."$2}')
+          if [[ "${TAG}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            DEST=$(echo ${TAG#v} | awk -F '[.]' '{print "release-"$1"."$2}')
+          else
+            DEST="main"
+          fi
           echo "TAG=${TAG#v}" >> $GITHUB_ENV
           echo "DEST=${DEST}" >> $GITHUB_ENV
       -

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
@@ -17,11 +17,12 @@ permissions:
 
 jobs:
 
-  check-branch:
+  check-version:
     name: Evaluate release tag
     runs-on: ubuntu-22.04
     outputs:
       is_latest: ${{ env.IS_LATEST }}
+      is_stable: ${{ env.IS_STABLE }}
     steps:
       -
         name: Checkout
@@ -30,7 +31,7 @@ jobs:
           # To identify the commit we need the history and all the tags.
           fetch-depth: 0
       -
-        name: Check release branch
+        name: Check release version
         run: |
           tag="${GITHUB_REF#refs/tags/v}"
           latest_release_branch=$(git branch -rl 'origin/release-*' | sort -r | head -n1 | sed -e 's/^.*\(release-.*\)/\1/')
@@ -39,13 +40,18 @@ jobs:
           if [[ "$latest_release_branch" == "$current_release_branch" ]]; then
             is_latest="true"
           fi
+          is_stable="false"
+          if [[ "$tag" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            is_stable="true"
+          fi
           echo "IS_LATEST=${is_latest}" >> $GITHUB_ENV
+          echo "IS_STABLE=${is_stable}" >> $GITHUB_ENV
 
   release:
     name: Create Github release
     runs-on: ubuntu-22.04
     needs:
-      - check-branch
+      - check-version
     steps:
       -
         name: Checkout
@@ -74,15 +80,16 @@ jobs:
           draft: false
           name: v${{ env.TAG }}
           files: releases/cnpg-${{ env.VERSION }}.yaml
-          make_latest: ${{ needs.check-branch.outputs.is_latest }}
+          make_latest: ${{ needs.check-version.outputs.is_latest == 'true' && needs.check-version.outputs.is_stable == 'true' }}
+          prerelease: ${{ needs.check-version.outputs.is_stable == 'false' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   release-binaries:
     name: Build containers
     runs-on: ubuntu-22.04
     needs:
-      - check-branch
+      - check-version
     outputs:
       version: ${{ steps.build-meta.outputs.version }}
       author_name: ${{ steps.build-meta.outputs.author_name }}
@@ -151,16 +158,22 @@ jobs:
           GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
       -
         name: Publish Krew
-        if: ${{ needs.check-branch.outputs.is_latest == 'true' }}
+        if: |
+          needs.check-version.outputs.is_latest == 'true' &&
+          needs.check-version.outputs.is_stable == 'true'
         uses: rajatjindal/[email protected]
         with:
           krew_template_file: dist/krew/cnpg.yaml
       -
         name: Docker meta
         id: docker-meta
         uses: docker/metadata-action@v5
+        env:
+          IS_LATEST: ${{ needs.check-version.outputs.is_latest == 'true' && needs.check-version.outputs.is_stable == 'true' }}
         with:
           images: ${{ env.IMAGES }}
+          flavor: |
+            latest=${{ env.IS_LATEST }}
           tags: |
             type=semver,pattern={{version}}
       -
@@ -245,12 +258,13 @@ jobs:
     name: Create OLM bundle and catalog
     runs-on: ubuntu-22.04
     needs:
-      - check-branch
+      - check-version
       - release-binaries
     if: |
       (always() && !cancelled()) &&
       needs.release-binaries.result == 'success' &&
-      needs.check-branch.outputs.is_latest == 'true'
+      needs.check-version.outputs.is_latest == 'true' &&
+      needs.check-version.outputs.is_stable == 'true'
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -388,7 +402,6 @@ jobs:
       - release-binaries
     if: |
       (always() && !cancelled()) &&
-      needs.release-binaries.result == 'success' &&
       needs.olm-bundle.result == 'success' &&
       github.repository_owner == 'cloudnative-pg'
     env:

diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml
@@ -7,6 +7,9 @@ on:
       - closed
     branches:
       - release-*
+      - main
+    paths:
+      - 'pkg/versions/versions.go'
 
 jobs:
   tag:
@@ -21,6 +24,6 @@ jobs:
         uses: christophebedard/[email protected]
         with:
           token: ${{ secrets.REPO_GHA_PAT }}
-          version_regex: '^Version tag to ([0-9]+\.[0-9]+\.[0-9]+)'
+          version_regex: '^Version tag to ([0-9]+\.[0-9]+\.[0-9]+(?:-[a-z][0-9a-z]*)?)'
           version_tag_prefix: v
           dry_run: false
diff --git a/contribute/release_procedure.md b/contribute/release_procedure.md
@@ -4,9 +4,9 @@ This section describes how to release a new set of supported versions of
 CloudNativePG, which should be done by one of the project's maintainers.
 It is a semi-automated process that requires human supervision.
 
-You can only release from a release branch, that is a branch in the
-Git repository called `release-X.Y`, e.g., `release-1.16`, which corresponds
-to a minor release.
+You can only release stable versions from a release branch, that is a branch
+in the Git repository called `release-X.Y`, e.g., `release-1.16`, which
+corresponds to a minor release.
 
 The release procedure must be repeated for all the supported minor releases,
 usually 3:
@@ -122,7 +122,7 @@ but in `release-1.17`, the file should stay in `release_notes/`.
 
 **IMPORTANT:** The instructions in the previous sections should have been completed ahead
 of this. I.e., all cherry-picks should be done, documents should be up-to-date,
-and the  release notes should have been merged in `main`.
+and the release notes should have been merged in `main`.
 
 A new release branch is created starting from the most updated commit in the
 trunk by a maintainer:
@@ -237,3 +237,25 @@ and the Kubernetes ones are aligned with the supported release page.
 
 Open the `.github/ISSUE_TEMPLATES/bug.yml` file and update it accordingly.
 
+## Release candidate
+
+It's possible to create a release candidate (RC) for a new upcoming
+minor release.
+Unlike stable releases, a release candidate will be released just for one
+version, as such the release process doesn't have to be repeated for all
+the supported release branches.
+
+**IMPORTANT:** Release candidates should always be released from the
+`main` branch. A release branch for a new minor should only be created
+once we are releasing the first stable version. This is necessary to
+ensure the newly created release branch is a descendant of the `main`
+branch.
+
+To release a RC you can follow the [Release steps](#release-steps) until
+point 5, taking care to use a valid semantic version when running the first
+step (e.g., `hack/release.sh 1.16.0-rc1`).
+See [Semantic Versioning 2.0.0 - item 9](https://semver.org/#spec-item-9) to
+check for valid release candidate identifiers.
+
+**NOTE:** Release candidates can only be installed via the YAML manifest,
+other installation methods such as Helm Chart or OLM are currently not supported.
diff --git a/docs/src/supported_releases.md b/docs/src/supported_releases.md
@@ -24,43 +24,57 @@ Subsequent patch releases on a minor release contain backward-compatible changes
 * [Support status of CloudNativePG releases](#support-status-of-cloudnativepg-releases)
 * [What we mean by support](#what-we-mean-by-support)
 
-## Support policy
+## Support Policy
 
-We produce new builds of CloudNativePG for each commit.
+CloudNativePG produces new builds for each commit.
 
-Approximately every two months, we build a minor release and run through several
-additional tests as well as release qualification. We release patch versions
-for issues found in supported minor releases.
+Approximately every two months, we create a minor release that undergoes
+several additional tests and a thorough release qualification process. We
+release patch versions for issues found in supported minor releases.
 
-The various types of releases represent a different product quality level and
-level of assistance from the CloudNativePG community.
-For details on the support provided by the community, see
-[What we mean by support](#what-we-mean-by-support).
+Before an official release, at least one Release Candidate (RC) is built for
+testing. Additional release candidates may be issued if new bugs are
+discovered. The Release Candidates are announced on the Slack channel to
+encourage community testing before the final release. The maintainers provide
+1-2 weeks for community testing, and if no objections are raised, the final
+release is announced.
+
+Different types of releases represent varying levels of product quality and
+assistance from the CloudNativePG community. For details on the support
+provided by the community, see [What we mean by support](#what-we-mean-by-support).
 
 | Type              | Support level                                                                                                         | Quality and recommended Use                                                                                    |
 |-------------------|-----------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------|
-| Development Build | No support                                                                                                            | Dangerous, might not be fully reliable. Useful to experiment with.                                               |
+| Development Build | No support                                                                                                            | Dangerous, might not be fully reliable. Useful to experiment with.                                             |
+| Release Candidate | No support                                                                                                            | Preview version: Not production-ready. Released for experimentation and testing.                               |
 | Minor Release     | Support provided until 3 months after the N+1 minor release (ex. 1.23 supported until 3 months after 1.24.0 is released)|
 | Patch             | Same as the corresponding minor release                                                                               | Users are encouraged to adopt patch releases as soon as they are available for a given release.                |
-| Security Patch    | Same as a patch, however, it doesn't contain any additional code other than the security fix from the previous patch | Given the nature of security fixes, users are **strongly** encouraged to adopt security patches after release. |
+| Security Patch    | Same as a patch, however, it doesn't contain any additional code other than the security fix from the previous patch  | Given the nature of security fixes, users are **strongly** encouraged to adopt security patches after release. |
 
 You can find available releases on the [releases page](https://github.com/cloudnative-pg/cloudnative-pg/releases).
 
-You can find high-level more information for each minor and patch release in the [release notes](release_notes.md).
+You can find high-level more information for each minor and patch release in
+the [release notes](release_notes.md).
+
+Sure, here’s an improved version of the naming scheme section:
 
-## Naming scheme
+## Naming Scheme
 
-Our naming scheme is based on [Semantic Versioning 2.0.0](https://semver.org/)
-as follows:
+Our naming scheme follows [Semantic Versioning 2.0.0](https://semver.org/) and
+is structured as follows:
 
 ```
 <major>.<minor>.<patch>
 ```
 
-Where `<minor>` is increased for each release, and `<patch>` counts the number of patches for the
-current `<minor>` release. A patch is usually a small change relative to the `<minor>` release.
+- `<minor>` is incremented for each release.
+- `<patch>` counts the number of patches for the current `<minor>` release,
+  representing small changes relative to the `<minor>` release.
+
+Release candidates are indicated by an additional `-<pre-release>` identifier
+following the patch version, as specified in [Semantic Versioning 2.0.0 - item #9](https://semver.org/#spec-item-9).
 
-Git tags for versions are prepended with `v`.
+Git tags for versions are prefixed with `v`.
 
 ## Support status of CloudNativePG releases
 

diff --git a/hack/release.sh b/hack/release.sh
@@ -68,14 +68,28 @@ require_clean_work_tree () {
 
 require_clean_work_tree "release"
 
-# Verify that you are in a release branch
-if branch=$(git symbolic-ref --short -q HEAD) && [[ "$branch" == release-* ]]
-then
+# Verify that you are in a proper branch
+# Releases can only be triggered from:
+# - a release branch (for stable releases)
+# - main (for release candidate only)
+branch=$(git symbolic-ref --short -q HEAD)
+case $branch in
+  release-*)
     echo "Releasing ${release_version}"
-else
-    echo >&2 "Release is not possible because you are not on a 'release-*' branch ($branch)"
+    ;;
+  main)
+    if [[ "${release_version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]
+    then
+        echo >&2 "Cannot release a stable version from 'main'"
+        exit 1
+    fi
+    echo "Releasing ${release_version}"
+    ;;
+  *)
+    echo >&2 "Release is not possible because you are not on 'main' or a 'release-*' branch ($branch)"
     exit 1
-fi
+    ;;
+esac
 
 make kustomize
 KUSTOMIZE="${REPO_ROOT}/bin/kustomize"