Combine dependency updates

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>

.github/configs/updatecli.d/grafana.yaml

@@ -1,30 +0,0 @@
-name: Bump grafana version specified in the values.yaml
-sources:
-    latestGrafanaRelease:
-        name: Get latest grafana release on Github
-        kind: githubrelease
-        spec:
-            owner: grafana
-            repository: grafana
-            token: '{{ requiredEnv "UPDATECLI_GITHUB_TOKEN" }}'
-            versionfilter:
-                kind: latest
-        transformers:
-          - trimprefix: "v"
-conditions:
-    grafanaImagePublished:
-        name: Ensure the latest Grafana is published on DockerHub
-        kind: dockerimage
-        source-id: latestGrafanaRelease
-        spec:
-            image: "grafana/grafana"
-targets:
-    grafana:
-        name: Update Grafana version in values.yaml
-        kind: helmchart
-        spec:
-            file: values.yaml
-            key: $.grafana.version
-            name: charts/meta-monitoring
-            versionincrement: none
-        sourceid: latestGrafanaRelease

.github/workflows/check-for-dependency-updates.yaml

@@ -16,7 +16,7 @@ env:
     UPDATECLI_GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
 jobs:
-    updateLoki:
+    updateVersions:
         name: Update the Loki subchart
         runs-on: "ubuntu-latest"
         steps:
@@ -26,7 +26,7 @@ jobs:
             - name: Install Updatecli
               uses: updatecli/updatecli-action@v2
 
-            - name: Run Updatecli
+            - name: Run Updatecli for Loki
               id: update-loki
               run: |
                 updatecli apply --config ${UPDATECLI_CONFIG_DIR}/loki.yaml
@@ -34,31 +34,7 @@ jobs:
                   echo "changed=true" >> "${GITHUB_OUTPUT}"
                 fi
 
-            - name: Create pull request
+            - name: Run Updatecli for Alloy
-              if: steps.update-loki.outputs.changed == 'true'
-              uses: peter-evans/create-pull-request@v5
-              with:
-                title: "[dependency] Update the Loki subchart"
-                body: "Updates the Loki subchart"
-                base: main
-                author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
-                committer: "GitHub <noreply@github.com>"
-                commit-message: Update loki
-                labels: dependencies
-                branch: chore/update-loki
-                delete-branch: true
-
-    updateGrafanaAlloy:
-        name: Update the Grafana Alloy subchart
-        runs-on: "ubuntu-latest"
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - name: Install Updatecli
-              uses: updatecli/updatecli-action@v2
-
-            - name: Run Updatecli
               id: update-grafana-alloy
               run: |
                 updatecli apply --config ${UPDATECLI_CONFIG_DIR}/alloy.yaml
@@ -66,144 +42,40 @@ jobs:
                   echo "changed=true" >> "${GITHUB_OUTPUT}"
                 fi
 
-            - name: Create pull request
+            - name: Run Updatecli for Mimir
-              if: steps.update-grafana-alloy.outputs.changed == 'true'
-              uses: peter-evans/create-pull-request@v5
-              with:
-                title: "[dependency] Update the Grafana Alloy subchart"
-                body: "Updates the Grafana Alloy subchart"
-                base: main
-                author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
-                committer: "GitHub <noreply@github.com>"
-                commit-message: Update Grafana Alloy
-                labels: dependencies
-                branch: chore/update-grafana-alloy
-                delete-branch: true
-
-    updateMimirDistributed:
-        name: Update the Mimir Distributed subchart
-        runs-on: "ubuntu-latest"
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - name: Install Updatecli
-              uses: updatecli/updatecli-action@v2
-
-            - name: Run Updatecli
               id: update-mimir-distributed
               run: |
-                updatecli apply --config ${UPDATECLI_CONFIG_DIR}/mimir-distributed.yaml
+                  updatecli apply --config ${UPDATECLI_CONFIG_DIR}/mimir-distributed.yaml
-                if ! git diff --exit-code > /dev/null; then
+                  if ! git diff --exit-code > /dev/null; then
-                  echo "changed=true" >> "${GITHUB_OUTPUT}"
+                    echo "changed=true" >> "${GITHUB_OUTPUT}"
-                fi
+                  fi
 
-            - name: Create pull request
+            - name: Run Updatecli for Tempo
-              if: steps.update-mimir-distributed.outputs.changed == 'true'
-              uses: peter-evans/create-pull-request@v5
-              with:
-                title: "[dependency] Update the Mimir Distributed subchart"
-                body: "Updates the Mimir Distributed subchart"
-                base: main
-                author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
-                committer: "GitHub <noreply@github.com>"
-                commit-message: Update Mimir Distributed
-                labels: dependencies
-                branch: chore/update-mimir-distributed
-                delete-branch: true
-
-    updateTempoDistributed:
-        name: Update the Tempo Distributed subchart
-        runs-on: "ubuntu-latest"
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - name: Install Updatecli
-              uses: updatecli/updatecli-action@v2
-
-            - name: Run Updatecli
               id: update-tempo-distributed
               run: |
-                updatecli apply --config ${UPDATECLI_CONFIG_DIR}/tempo-distributed.yaml
+                    updatecli apply --config ${UPDATECLI_CONFIG_DIR}/tempo-distributed.yaml
-                if ! git diff --exit-code > /dev/null; then
+                    if ! git diff --exit-code > /dev/null; then
-                  echo "changed=true" >> "${GITHUB_OUTPUT}"
+                      echo "changed=true" >> "${GITHUB_OUTPUT}"
-                fi
+                    fi
 
-            - name: Create pull request
+            - name: Run Updatecli for Minio
-              if: steps.update-tempo-distributed.outputs.changed == 'true'
-              uses: peter-evans/create-pull-request@v5
-              with:
-                title: "[dependency] Update the Tempo Distributed subchart"
-                body: "Updates the tempo Distributed subchart"
-                base: main
-                author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
-                committer: "GitHub <noreply@github.com>"
-                commit-message: Update Tempo Distributed
-                labels: dependencies
-                branch: chore/update-tempo-distributed
-                delete-branch: true
-
-    updateMinio:
-        name: Update the Minio subchart
-        runs-on: "ubuntu-latest"
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - name: Install Updatecli
-              uses: updatecli/updatecli-action@v2
-
-            - name: Run Updatecli
               id: update-minio
               run: |
-                updatecli apply --config ${UPDATECLI_CONFIG_DIR}/minio.yaml
+                      updatecli apply --config ${UPDATECLI_CONFIG_DIR}/minio.yaml
-                if ! git diff --exit-code > /dev/null; then
+                      if ! git diff --exit-code > /dev/null; then
-                  echo "changed=true" >> "${GITHUB_OUTPUT}"
+                        echo "changed=true" >> "${GITHUB_OUTPUT}"
-                fi
+                      fi
 
             - name: Create pull request
-              if: steps.update-minio.outputs.changed == 'true'
+              if: steps.update-loki.outputs.changed == 'true' || steps.update-grafana-alloy.outputs.changed == 'true' || steps.update-mimir-distributed.outputs.changed == 'true' || steps.update-tempo-distributed.outputs.changed == 'true' || steps.update-minio.outputs.changed == 'true'
               uses: peter-evans/create-pull-request@v5
               with:
-                title: "[dependency] Update the Minio subchart"
+                title: "[dependency] Update the subcharts"
-                body: "Updates the Minio subchart"
+                body: "Updates the subcharts"
                 base: main
                 author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
                 committer: "GitHub <noreply@github.com>"
-                commit-message: Update minio
+                commit-message: Update dependencies
                 labels: dependencies
-                branch: chore/update-minio
+                branch: chore/update-dependencies
-                delete-branch: true
-
-    updateGrafana:
-        name: Update the Grafana version
-        runs-on: "ubuntu-latest"
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - name: Install Updatecli
-              uses: updatecli/updatecli-action@v2
-
-            - name: Run Updatecli
-              id: update-grafana
-              run: |
-                updatecli apply --config ${UPDATECLI_CONFIG_DIR}/grafana.yaml
-                if ! git diff --exit-code > /dev/null; then
-                  echo "changed=true" >> "${GITHUB_OUTPUT}"
-                fi
-
-            - name: Create pull request
-              if: steps.update-grafana.outputs.changed == 'true'
-              uses: peter-evans/create-pull-request@v5
-              with:
-                title: "[dependency] Update the Grafana version"
-                body: "Updates the Grafana version"
-                base: main
-                author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
-                committer: "GitHub <noreply@github.com>"
-                commit-message: Update Grafana version
-                labels: dependencies
-                branch: chore/update-minio
                 delete-branch: true

charts/meta-monitoring/Chart.lock

@@ -10,9 +10,9 @@ dependencies:
   version: 5.3.0
 - name: tempo-distributed
   repository: https://grafana.github.io/helm-charts
-  version: 1.9.5
+  version: 1.9.7
 - name: minio
   repository: https://charts.min.io
   version: 5.2.0
-digest: sha256:6244c08b5829d6dbd363b736e55c5182274d65191672e7aeecaf3bb62f3f34fb
+digest: sha256:297f462812b6436834d8b82a028840bd55bd9e935b3d0a3e8206ac54a113be01
-generated: "2024-05-07T07:02:47.839270709Z"
+generated: "2024-05-07T09:22:16.438693788Z"

charts/meta-monitoring/Chart.yaml

@@ -33,7 +33,7 @@ dependencies:
   condition: local.metrics.enabled
 - name: tempo-distributed
   repository: https://grafana.github.io/helm-charts
-  version: 1.9.5
+  version: 1.9.7
   condition: local.traces.enabled
 - name: minio
   repository: https://charts.min.io

charts/meta-monitoring/templates/grafana/grafana.yaml

@@ -32,7 +32,7 @@ spec:
           - 0
       containers:
         - name: grafana
-          image: grafana/grafana:{{- .Values.grafana.version }}
+          image: grafana/grafana:10.0.0
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 3000

charts/meta-monitoring/values.yaml

@@ -31,7 +31,6 @@ local:
     enabled: false  # This should be set to true if any of the previous is enabled
 
 grafana:
-  version: 10.0.0
   # Gateway ingress configuration
   ingress:
     # -- Specifies whether an ingress for the gateway should be created