Merge pull request #109 from jacobbaungard/acm-release-2.14

ACM: Move to release-2.14

Author: jacobbaungard

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

@@ -20,7 +20,7 @@ jobs:
       upstream: prometheus/alertmanager
       downstream: stolostron/prometheus-alertmanager
       sandbox: rhobs/acm-prometheus-alertmanager
-      go-version: "1.22"
+      go-version: "1.23"
       restore-upstream: >-
         CHANGELOG.md
         VERSION
@@ -42,4 +42,4 @@ jobs:
       pr-app-private-key: ${{ secrets.ACM_APP_PRIVATE_KEY }}
       cloner-app-id: ${{ secrets.ACM_CLONER_APP_ID }}
       cloner-app-private-key: ${{ secrets.ACM_CLONER_APP_PRIVATE_KEY }}
-      slack-webhook-url: ${{ secrets.ACM_SLACK_WEBHOOK_URL }}
+      slack-webhook-url: ${{ secrets.ACM_SLACK_WEBHOOK_URL }}

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

@@ -22,7 +22,7 @@ on:
       downstream-branch:
         description: Downstream branch to create PR
         required: false
-        default: release-2.12
+        default: release-2.14
         type: string
       sandbox:
         description: Sandbox repo path in owner/repo format. Used as a base to create PR against downstream.
@@ -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-grafana.yaml

@@ -19,12 +19,13 @@ jobs:
       upstream: grafana/grafana
       downstream: stolostron/grafana
       sandbox: rhobs/acm-grafana
-      go-version: "1.22"
-      node-version: "20"
+      go-version: "1.23"
+      node-version: "22"
       go-mod-tidy: false
       restore-downstream: >-
         OWNERS
       restore-upstream: >-
+        .betterer.results
         .drone.yml
         CHANGELOG.md
         docs
@@ -33,11 +34,13 @@ jobs:
         go.work
         go.work.sum
         pkg
+        scripts
         lerna.json
         package.json
         packages
         public/app/
         yarn.lock
+        SECURITY.md
       assets-cmd: |
         # get rid of old assets as new filenames are generated
         rm -rf ./public/build/

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

@@ -20,7 +20,7 @@ jobs:
       upstream: kubernetes/kube-state-metrics
       downstream: stolostron/kube-state-metrics
       sandbox: rhobs/acm-kube-state-metrics
-      go-version: "1.21"
+      go-version: "1.23"
       restore-upstream: >-
         CHANGELOG.md 
         VERSION

.github/workflows/merge-acm-node-exporter.yaml

@@ -19,7 +19,7 @@ jobs:
       upstream: prometheus/node_exporter
       downstream: stolostron/node-exporter
       sandbox: rhobs/acm-node-exporter
-      go-version: "1.21"
+      go-version: "1.23"
       restore-downstream: >-
          OWNERS
       restore-upstream: >-

.github/workflows/merge-acm-prometheus-operator.yaml

@@ -19,7 +19,7 @@ jobs:
       upstream: prometheus-operator/prometheus-operator
       downstream: stolostron/prometheus-operator
       sandbox: rhobs/acm-prometheus-operator
-      go-version: "1.21"
+      go-version: "1.23"
       restore-upstream: >-
         CHANGELOG.md
         Documentation

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

@@ -19,13 +19,16 @@ jobs:
       upstream: prometheus/prometheus
       downstream: stolostron/prometheus
       sandbox: rhobs/acm-prometheus
-      go-version: "1.21"
+      go-version: "1.23"
       restore-upstream: >-
         CHANGELOG.md
         VERSION
         go.mod
         go.sum
         .golangci.yml
+        discovery
+        promql
+        storage
       assets-cmd: |
         # Only compress assets if assets actually changed
         # The git diff relies on gits remote naming. The merge-flow checks out

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

@@ -19,7 +19,7 @@ jobs:
       upstream: thanos-io/thanos
       downstream: stolostron/thanos
       sandbox: rhobs/acm-thanos
-      go-version: "1.22"
+      go-version: "1.23"
       restore-downstream: >-
         OWNERS
       restore-upstream: >-