From 5ddb47de1c4fcb7ae183e90ca94ecac89dddc58c Mon Sep 17 00:00:00 2001 From: Erich Blume Date: Wed, 4 Mar 2026 07:53:22 -0800 Subject: [PATCH] Review upgrade-grafana doc: fix image tag ref, add sidecar link Co-Authored-By: Claude Opus 4.6 --- docs/changelog.d/+review-upgrade-grafana.doc.md | 1 + docs/how-to/grafana/upgrade-grafana.md | 8 +++++--- service-versions.yaml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 docs/changelog.d/+review-upgrade-grafana.doc.md diff --git a/docs/changelog.d/+review-upgrade-grafana.doc.md b/docs/changelog.d/+review-upgrade-grafana.doc.md new file mode 100644 index 0000000..b5c0ddf --- /dev/null +++ b/docs/changelog.d/+review-upgrade-grafana.doc.md @@ -0,0 +1 @@ +Review and fix upgrade-grafana doc: correct image tag reference to kustomization.yaml, add sidecar cross-reference, update stale service-versions notes. diff --git a/docs/how-to/grafana/upgrade-grafana.md b/docs/how-to/grafana/upgrade-grafana.md index 6371ee1..547e726 100644 --- a/docs/how-to/grafana/upgrade-grafana.md +++ b/docs/how-to/grafana/upgrade-grafana.md @@ -3,7 +3,8 @@ title: Upgrade Grafana requires: - kustomize-grafana-deployment - build-grafana-container -modified: 2026-02-23 +modified: 2026-03-04 +last-reviewed: 2026-03-04 tags: - how-to - grafana @@ -16,7 +17,7 @@ Upgraded Grafana from 11.4.0 (Helm chart) to 12.3.3, converting from Helm to Kus ## What Changed -- **Image:** `docker.io/grafana/grafana:11.4.0` → `registry.ops.eblu.me/blumeops/grafana:v12.3.3` +- **Image:** `docker.io/grafana/grafana:11.4.0` → `registry.ops.eblu.me/blumeops/grafana` (tagged via Kustomize `images:` overlay) - **Deployment:** Helm multi-source (chart + values) → single Kustomize directory - **ArgoCD app:** Simplified to one source pointing at `argocd/manifests/grafana/` @@ -36,7 +37,7 @@ To upgrade Grafana again in the future: 1. Update `CONTAINER_APP_VERSION` in `containers/grafana/Dockerfile` 2. Build and push via `mise run container-build-and-release grafana` -3. Update the image tag in `argocd/manifests/grafana/deployment.yaml` +3. Update the image tag in `argocd/manifests/grafana/kustomization.yaml` (under `images:`) 4. Update `service-versions.yaml` 5. Sync: `argocd app sync grafana` @@ -46,4 +47,5 @@ The SQLite PVC is disposable — dashboards come from ConfigMaps and datasources - [[grafana]] — Service reference card - [[build-grafana-container]] — Building the container image +- [[build-grafana-sidecar]] — Building the dashboard sidecar image - [[kustomize-grafana-deployment]] — Kustomize manifest structure diff --git a/service-versions.yaml b/service-versions.yaml index 396de0e..88e10b5 100644 --- a/service-versions.yaml +++ b/service-versions.yaml @@ -85,7 +85,7 @@ services: last-reviewed: 2026-02-23 current-version: "12.3.3" upstream-source: https://github.com/grafana/grafana/releases - notes: Home-built container; upgrading to 12.x via Mikado chain + notes: Home-built container from Alpine; upgraded from Helm to Kustomize - name: grafana-sidecar type: argocd