ACM: Update version on version bumps

For upstream that doesn't have version files, and were we added them
ourselves, we want to update the version file to match the tag we
actually upprade to.

Also remove custom version parsing from KSM again as this was the root
casue of the failure.

Signed-off-by: Jacob Baungard Hansen <[email protected]>

Author: jacobbaungard

.github/workflows/merge-acm-flow.yaml

@@ -170,15 +170,18 @@ jobs:
       - name: Continue after merge conflict
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: git merge --continue
-      - name: Add VERSION file if not present
+      - name: Add or update VERSION file
         run: |
           # All tags use the vX.Y.Z format currently.
           version_from_tag=$(echo ${{ steps.upstream.outputs.release }} | sed -e "s/^v//")
           if [ -f VERSION ]; then
             version_from_file=$(cat VERSION)
             if [ "$version_from_tag" != "$version_from_file" ];then
-              echo "::error:: tag version ${version_from_tag} doesn't correspond to version ${version_from_file} from VERSION file"
-              exit 1
+              echo "Updating version file to ${version_from_tag}"
+              echo "$version_from_tag" > VERSION
+              git add VERSION
+              git diff --cached --exit-code || git commit -s -m "[bot] update VERSION file with ${version_from_tag}"
+              exit 0
             fi
             echo "::notice::VERSION file already present"
             exit 0

.github/workflows/merge-acm-kube-state-metrics.yaml

@@ -27,8 +27,6 @@ jobs:
       restore-downstream: >-
         OWNERS
         docs
-      downstream-version-expression: |
-         sed -n -E '1 s/^[^0-9]*(([0-9]+\.)*[0-9]+).*$/v\1/p' https://raw.githubusercontent.com/stolostron/kube-state-metrics/refs/heads/${{ inputs.downstream-branch }}/CHANGELOG.md
     secrets:
       pr-app-id: ${{ secrets.ACM_APP_ID }}
       pr-app-private-key: ${{ secrets.ACM_APP_PRIVATE_KEY }}