From 9bb4c3724480923862582a68961cc12de9a5a2dd Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Tue, 27 Aug 2024 15:55:21 +0200 Subject: [PATCH] grafana 10.2.3->11.1.4 + mirror images --- .github/workflows/images.yaml | 22 ++++++++++++++++++++++ monitoring/grafana/kustomization.yaml | 8 ++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml index 88b9fd2..5c6babc 100644 --- a/.github/workflows/images.yaml +++ b/.github/workflows/images.yaml @@ -69,3 +69,25 @@ jobs: run: | TAG_BUILDKIT=${{ steps.imageBuildkitTag.outputs.result }} crane cp docker.io/moby/buildkit:$TAG_BUILDKIT ghcr.io/yolean/buildkit:$TAG_BUILDKIT + - + name: Get grafana image tag + id: imageGrafanaTag + uses: mikefarah/yq@v4.44.1 + with: + cmd: yq '.images[0].newTag' monitoring/grafana/kustomization.yaml + - + name: Mirror grafana image from hub + run: | + TAG_GRAFANA=${{ steps.imageGrafanaTag.outputs.result }} + crane cp docker.io/grafana/grafana:$TAG_GRAFANA ghcr.io/yolean/grafana:$TAG_GRAFANA + - + name: Get grafana-image-renderer image tag + id: imageGrafanaImageRendererTag + uses: mikefarah/yq@v4.44.1 + with: + cmd: yq '.images[1].newTag' monitoring/grafana/kustomization.yaml + - + name: Mirror grafana-image-renderer image from hub + run: | + TAG_GRAFANAIMG=${{ steps.imageGrafanaImageRendererTag.outputs.result }} + crane cp docker.io/grafana/grafana-image-renderer:$TAG_GRAFANAIMG ghcr.io/yolean/grafana-image-renderer:$TAG_GRAFANAIMG diff --git a/monitoring/grafana/kustomization.yaml b/monitoring/grafana/kustomization.yaml index b6403ce..a197dfc 100644 --- a/monitoring/grafana/kustomization.yaml +++ b/monitoring/grafana/kustomization.yaml @@ -5,11 +5,11 @@ namespace: monitoring images: - name: grafana/grafana - newName: docker.io/grafana/grafana - newTag: 10.2.3-ubuntu@sha256:d292a458726385a81fcf71c8fd4a67b6976f527585fc82cb6e24825d01c5797a + newName: ghcr.io/yolean/grafana + newTag: 11.1.4-ubuntu@sha256:8e74fb7eed4d59fb5595acd0576c21411167f6b6401426ae29f2e8f9f71b68f6 - name: grafana/grafana-image-renderer - newName: docker.io/grafana/grafana-image-renderer - newTag: 3.9.0@sha256:656ca4dddc020f067239428e2a15bc7100d8ce4918db1618b45d53d0c8c4d273 + newName: ghcr.io/yolean/grafana-image-renderer + newTag: 3.11.3@sha256:6de5a28a29328f972ed538b6172f07b2ff9204ee76c7f0bf32fd6da1d60956d4 resources: - grafana-service.yaml