From 26e0ad0b85502d84ea2462566f091e11e6d8804a Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Tue, 7 May 2024 09:20:51 +0100 Subject: [PATCH 1/9] Add CI action to update Grafana version Signed-off-by: Michel Hollands --- .github/configs/updatecli.d/grafana.yaml | 28 ++++++++++++++++ .../check-for-dependency-updates.yaml | 32 +++++++++++++++++++ .../templates/grafana/grafana.yaml | 2 +- charts/meta-monitoring/values.yaml | 1 + 4 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 .github/configs/updatecli.d/grafana.yaml diff --git a/.github/configs/updatecli.d/grafana.yaml b/.github/configs/updatecli.d/grafana.yaml new file mode 100644 index 0000000..3fe0b37 --- /dev/null +++ b/.github/configs/updatecli.d/grafana.yaml @@ -0,0 +1,28 @@ +name: Bump dependency "loki" for Helm chart "meta-monitoring" +sources: + latestGrafanaRelease: + name: Get latest grafana release on Github + kind: githubrelease + spec: + owner: grafana + repository: grafana + name: loki + versionfilter: + kind: latest +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.image + name: charts/meta-monitoring + versionincrement: none + sourceid: loki diff --git a/.github/workflows/check-for-dependency-updates.yaml b/.github/workflows/check-for-dependency-updates.yaml index dbcdd6f..afd8b4d 100644 --- a/.github/workflows/check-for-dependency-updates.yaml +++ b/.github/workflows/check-for-dependency-updates.yaml @@ -175,3 +175,35 @@ jobs: labels: dependencies branch: chore/update-minio 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 " + commit-message: Update Grafana version + labels: dependencies + branch: chore/update-minio + delete-branch: true diff --git a/charts/meta-monitoring/templates/grafana/grafana.yaml b/charts/meta-monitoring/templates/grafana/grafana.yaml index e30c61c..b1cf2fa 100644 --- a/charts/meta-monitoring/templates/grafana/grafana.yaml +++ b/charts/meta-monitoring/templates/grafana/grafana.yaml @@ -32,7 +32,7 @@ spec: - 0 containers: - name: grafana - image: grafana/grafana:10.0.0 + image: {{- .Values.grafana.image }} imagePullPolicy: IfNotPresent ports: - containerPort: 3000 diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml index 77dae8c..8b62b63 100644 --- a/charts/meta-monitoring/values.yaml +++ b/charts/meta-monitoring/values.yaml @@ -31,6 +31,7 @@ local: enabled: false # This should be set to true if any of the previous is enabled grafana: + image: grafana/grafana:10.0.0 # Gateway ingress configuration ingress: # -- Specifies whether an ingress for the gateway should be created From 7e65f3d9c9c057238e0c0e331200b946c287ff97 Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Tue, 7 May 2024 09:46:31 +0100 Subject: [PATCH 2/9] Fix sourceid Signed-off-by: Michel Hollands --- .github/configs/updatecli.d/grafana.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/configs/updatecli.d/grafana.yaml b/.github/configs/updatecli.d/grafana.yaml index 3fe0b37..3670df6 100644 --- a/.github/configs/updatecli.d/grafana.yaml +++ b/.github/configs/updatecli.d/grafana.yaml @@ -1,4 +1,4 @@ -name: Bump dependency "loki" for Helm chart "meta-monitoring" +name: Bump grafana version specified in the values.yaml sources: latestGrafanaRelease: name: Get latest grafana release on Github @@ -6,7 +6,6 @@ sources: spec: owner: grafana repository: grafana - name: loki versionfilter: kind: latest conditions: @@ -25,4 +24,4 @@ targets: key: grafana.image name: charts/meta-monitoring versionincrement: none - sourceid: loki + sourceid: latestGrafanaRelease From 643e73f5f12b66695093f6d6c46e1a1fdc9b82da Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Tue, 7 May 2024 09:54:50 +0100 Subject: [PATCH 3/9] add token Signed-off-by: Michel Hollands --- .github/configs/updatecli.d/grafana.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/configs/updatecli.d/grafana.yaml b/.github/configs/updatecli.d/grafana.yaml index 3670df6..5924cbf 100644 --- a/.github/configs/updatecli.d/grafana.yaml +++ b/.github/configs/updatecli.d/grafana.yaml @@ -6,6 +6,7 @@ sources: spec: owner: grafana repository: grafana + token: "{{ requiredEnv .github.token }}" versionfilter: kind: latest conditions: From d4c886ba9d9304d6d13981cbf2113ed293f657a4 Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Tue, 7 May 2024 10:00:55 +0100 Subject: [PATCH 4/9] Use token from env Signed-off-by: Michel Hollands --- .github/configs/updatecli.d/grafana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/configs/updatecli.d/grafana.yaml b/.github/configs/updatecli.d/grafana.yaml index 5924cbf..2d9516d 100644 --- a/.github/configs/updatecli.d/grafana.yaml +++ b/.github/configs/updatecli.d/grafana.yaml @@ -6,7 +6,7 @@ sources: spec: owner: grafana repository: grafana - token: "{{ requiredEnv .github.token }}" + token: '{{ requiredEnv "UPDATECLI_GITHUB_TOKEN" }}' versionfilter: kind: latest conditions: From 06e176e720a66a2b6e16f48465b15290dbcc0f61 Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Tue, 7 May 2024 10:11:17 +0100 Subject: [PATCH 5/9] Trim the v prefix from the released version Signed-off-by: Michel Hollands --- .github/configs/updatecli.d/grafana.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/configs/updatecli.d/grafana.yaml b/.github/configs/updatecli.d/grafana.yaml index 2d9516d..1b68d2b 100644 --- a/.github/configs/updatecli.d/grafana.yaml +++ b/.github/configs/updatecli.d/grafana.yaml @@ -9,6 +9,8 @@ sources: token: '{{ requiredEnv "UPDATECLI_GITHUB_TOKEN" }}' versionfilter: kind: latest + transformers: + - trimPrefix: "v" conditions: grafanaImagePublished: name: Ensure the latest Grafana is published on DockerHub From 90e949e89a6a757fad6f2f479f6e5695e9deaaf4 Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Tue, 7 May 2024 10:14:50 +0100 Subject: [PATCH 6/9] Change version param Signed-off-by: Michel Hollands --- .github/configs/updatecli.d/grafana.yaml | 2 +- charts/meta-monitoring/templates/grafana/grafana.yaml | 2 +- charts/meta-monitoring/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/configs/updatecli.d/grafana.yaml b/.github/configs/updatecli.d/grafana.yaml index 1b68d2b..21c60b5 100644 --- a/.github/configs/updatecli.d/grafana.yaml +++ b/.github/configs/updatecli.d/grafana.yaml @@ -10,7 +10,7 @@ sources: versionfilter: kind: latest transformers: - - trimPrefix: "v" + - trimprefix: "v" conditions: grafanaImagePublished: name: Ensure the latest Grafana is published on DockerHub diff --git a/charts/meta-monitoring/templates/grafana/grafana.yaml b/charts/meta-monitoring/templates/grafana/grafana.yaml index b1cf2fa..4fe45a2 100644 --- a/charts/meta-monitoring/templates/grafana/grafana.yaml +++ b/charts/meta-monitoring/templates/grafana/grafana.yaml @@ -32,7 +32,7 @@ spec: - 0 containers: - name: grafana - image: {{- .Values.grafana.image }} + image: grafana/grafana:{{- .Values.grafana.version }} imagePullPolicy: IfNotPresent ports: - containerPort: 3000 diff --git a/charts/meta-monitoring/values.yaml b/charts/meta-monitoring/values.yaml index 8b62b63..b728ddb 100644 --- a/charts/meta-monitoring/values.yaml +++ b/charts/meta-monitoring/values.yaml @@ -31,7 +31,7 @@ local: enabled: false # This should be set to true if any of the previous is enabled grafana: - image: grafana/grafana:10.0.0 + version: 10.0.0 # Gateway ingress configuration ingress: # -- Specifies whether an ingress for the gateway should be created From b0451d626ed287d47d3694f9c3075632a538ad5b Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Tue, 7 May 2024 10:16:10 +0100 Subject: [PATCH 7/9] Use $. in yaml key Signed-off-by: Michel Hollands --- .github/configs/updatecli.d/grafana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/configs/updatecli.d/grafana.yaml b/.github/configs/updatecli.d/grafana.yaml index 21c60b5..87413b0 100644 --- a/.github/configs/updatecli.d/grafana.yaml +++ b/.github/configs/updatecli.d/grafana.yaml @@ -24,7 +24,7 @@ targets: kind: helmchart spec: file: values.yaml - key: grafana.image + key: $.grafana.image name: charts/meta-monitoring versionincrement: none sourceid: latestGrafanaRelease From 076685ef065eb75ec497409d2c95a8a86856db5a Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Tue, 7 May 2024 10:18:55 +0100 Subject: [PATCH 8/9] Revert key Signed-off-by: Michel Hollands --- .github/configs/updatecli.d/grafana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/configs/updatecli.d/grafana.yaml b/.github/configs/updatecli.d/grafana.yaml index 87413b0..21c60b5 100644 --- a/.github/configs/updatecli.d/grafana.yaml +++ b/.github/configs/updatecli.d/grafana.yaml @@ -24,7 +24,7 @@ targets: kind: helmchart spec: file: values.yaml - key: $.grafana.image + key: grafana.image name: charts/meta-monitoring versionincrement: none sourceid: latestGrafanaRelease From e9125d1a9c5063c6de1731e2f50a914b0e0b451f Mon Sep 17 00:00:00 2001 From: Michel Hollands Date: Tue, 7 May 2024 10:21:42 +0100 Subject: [PATCH 9/9] Add corrected key Signed-off-by: Michel Hollands --- .github/configs/updatecli.d/grafana.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/configs/updatecli.d/grafana.yaml b/.github/configs/updatecli.d/grafana.yaml index 21c60b5..511f9b9 100644 --- a/.github/configs/updatecli.d/grafana.yaml +++ b/.github/configs/updatecli.d/grafana.yaml @@ -24,7 +24,7 @@ targets: kind: helmchart spec: file: values.yaml - key: grafana.image + key: $.grafana.version name: charts/meta-monitoring versionincrement: none sourceid: latestGrafanaRelease