CLOUDP-238747: Fix CI release flow (#1497)

Signed-off-by: jose.vazquez <jose.vazquez@mongodb.com>

Author: josvazg

.github/workflows/release-post-merge.yml

@@ -5,20 +5,20 @@
 name: Create Release
 
 on:
-  pull_request:
-    branches:
-      - pre-release/**
-      - release/**
-    types:
-      - closed
-  workflow_dispatch:
+  push:
+    tags:
+      - 'v*'
+  workflow_call:
     inputs:
-      version:
-        description: "Release version (Be sure `Release-branch` is successful):"
+      tag:
+        type: string
+        description: "Name of existing tag (or branch) to release (format should be 'v*')"
         required: true
-      branch:
-        description: "Name of the branch to release, defaults to 'main'"
-        default: main
+  workflow_dispatch:
+    inputs:
+      tag:
+        type: string
+        description: "Name of existing tag (or branch) to release (format should be 'v*')"
         required: true
       image_repo:
         type: choice
@@ -56,15 +56,12 @@ jobs:
   create-release:
     environment: release
     name: Create Release
-    if: github.event.pull_request.merged == true || github.event_name != 'workflow_dispatch'
     runs-on: ubuntu-latest
     env:
-      IMAGE_REPOSITORY: ${{ github.event.inputs.image_repo }}
       RELEASE_HELM: ${{ github.event.inputs.release_helm || 'true' }}
       CERTIFY: ${{ github.event.inputs.certify || 'true' }}
       RELEASE_TO_GITHUB: ${{ github.event.inputs.release_to_github || 'true' }}
-      BRANCH: ${{ github.event.inputs.branch || github.head_ref || github.ref_name || 'main' }}
-      VERSION: ${{ github.event.inputs.version }}
+      TAG: ${{ github.event.inputs.tag || github.head_ref || github.ref_name }}
     steps:
       - name: Free disk space
         run: | 
@@ -76,39 +73,30 @@ jobs:
       - name: Check release and show environment & version
         id: tag
         run: |
-          version="$VERSION"
-          if [[ "$version" == "" ]]; then
-            version=$(echo "$BRANCH" | awk -F '/' '{print $2}')
-            release=$(echo "$BRANCH" | awk -F '/' '{print $1}')
-            if [[ "$release" == "release" ]]; then
-              echo "Releasing version $version..."
-              repo="mongodb/mongodb-atlas-kubernetes-operator"
-            elif [[ "$release" == "pre-release" ]]; then
-              echo "Pre-releasing version $version..."
-              repo="mongodb/mongodb-atlas-kubernetes-operator-prerelease"
-              RELEASE_HELM=false
-              CERTIFY=false
-              RELEASE_TO_GITHUB=false
-            else
-              echo "Release branch must be 'release/...' or 'pre-release/...' but got: $release"
-              exit 1
-            fi
+          version=$(echo "${TAG}" |awk -F'^v' '{print $2}')
+          prerelease_tail=$(echo "${version}" | awk -F'-' '{print $2}')
+          if [[ "$prerelease_tail" == "" ]]; then
+            echo "Releasing version $version..."
+            repo="mongodb/mongodb-atlas-kubernetes-operator"
+          else
+            echo "Pre-releasing version $version..."
+            repo="mongodb/mongodb-atlas-kubernetes-operator-prerelease"
+            RELEASE_HELM=false
+            CERTIFY=false
+            RELEASE_TO_GITHUB=false
           fi
-          tag="v${version}"
-          certified_version="${version}-certified"
-          echo "release_helm=$RELEASE_HELM" >> "$GITHUB_OUTPUT"
-          echo "certify=$CERTIFY" >> "$GITHUB_OUTPUT"
-          echo "release_to_github=$RELEASE_TO_GITHUB" >> "$GITHUB_OUTPUT"
-          echo "repo=$repo" >> "$GITHUB_OUTPUT"
-          echo "version=$version" >> "$GITHUB_OUTPUT"
-          echo "tag=$tag" >> "$GITHUB_OUTPUT"
-          echo "certified_version=$certified_version" >> "$GITHUB_OUTPUT"
+          echo "release_helm=${RELEASE_HELM}" >> "$GITHUB_OUTPUT"
+          echo "certify=${CERTIFY}" >> "$GITHUB_OUTPUT"
+          echo "release_to_github=${RELEASE_TO_GITHUB}" >> "$GITHUB_OUTPUT"
+          echo "repo=${repo}" >> "$GITHUB_OUTPUT"
+          echo "version=${version}" >> "$GITHUB_OUTPUT"
+          echo "certified_version=${version}-certified" >> "$GITHUB_OUTPUT"
       - name: Check out code
         uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
-          ref: ${{ env.BRANCH }}
+          ref: ${{ env.TAG }}
       - name: Set up Go
         if: ${{ steps.tag.outputs.release_helm == 'true' }}
         uses: actions/setup-go@v5
@@ -218,8 +206,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ steps.tag.outputs.tag }}
-          release_name: ${{ steps.tag.outputs.tag }}
+          tag_name: ${{ env.TAG }}
+          release_name: ${{ env.TAG }}
           body_path: docs/release-notes/release-notes.md
           draft: true
           prerelease: false

.github/workflows/tag.yml

@@ -0,0 +1,41 @@
+name: Tag Release
+
+on:
+  pull_request:
+    types:
+    - closed
+
+jobs:
+  tag-release:
+    if: (github.event.pull_request.merged == true && (startsWith(github.head_ref, 'release/') || startsWith(github.head_ref, 'pre-release/')))
+    environment: release
+    name: Tag Release
+    runs-on: ubuntu-latest
+    env:
+      BRANCH: ${{ github.head_ref }}
+    outputs:
+      tag: ${{ steps.tag.outputs.tag }}
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          fetch-depth: 0
+          ref: ${{ env.BRANCH }}
+      - name: Tag and kick release
+        id: tag
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          version=$(echo "$BRANCH" | awk -F '/' '{print $2}')
+          tag="v${version}"
+          git tag "${tag}"
+          git push origin "${tag}"
+          echo "tag=${tag}" >> "$GITHUB_OUTPUT"
+
+  release-post-merge:
+    needs:
+    - tag-release
+    uses: ./.github/workflows/release-post-merge.yml
+    with:
+      tag: ${{ needs.tag-release.outputs.tag }}

docs/dev/release.md

@@ -24,6 +24,8 @@ The new job "Create Release" will be triggered and the following will be done:
 * Atlas Operator image built and pushed to dockerhub
 * Draft Release will be created with all commits since the previous release
 
+Once the Pull Request is approved, a tag is created out of the branch, which can then be discarded. A branch `release/X.Y.Z` will imply a tag `vX.Y.Z`, and `pre-release/X.Y.Z-...` will imply `vX.Y.Z-...`. The `tag.yml` workflow is the one responsible for creating such tag and triggering the release process workflow (`release-post-merge.yml`).
+
 ## Edit the Release Notes and publish the release
 
 Follow the format described in the release-notes-template.md file. Publish the release.