From 55563afc7e15e179806808ba106e5c0e11bf033e Mon Sep 17 00:00:00 2001 From: Erich Blume Date: Fri, 1 May 2026 08:31:27 -0700 Subject: [PATCH] =?UTF-8?q?C0:=20alloy=20=E2=80=94=20bump=20kustomization?= =?UTF-8?q?=20tags=20to=20main-branch=20SHA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per the build-container-image squash-merge convention, rebuild alloy v1.16.0 container images from the main SHA (9564435) and update the three alloy kustomizations to reference :v1.16.0-9564435[-nix] instead of the branch SHA :v1.16.0-26a3ab5[-nix] left over from #345. Both images were rebuilt locally on gilbert (dagger) and ringtail (nix) because indri is still under heavy macOS memory-compressor pressure (see separate ticket); CI on indri can't reliably run the dagger publish step. Co-Authored-By: Claude Opus 4.7 (1M context) --- argocd/manifests/alloy-k8s/kustomization.yaml | 2 +- argocd/manifests/alloy-ringtail/kustomization.yaml | 2 +- argocd/manifests/alloy-tracing-ringtail/kustomization.yaml | 2 +- docs/changelog.d/+alloy-main-sha-rebuild.infra.md | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 docs/changelog.d/+alloy-main-sha-rebuild.infra.md diff --git a/argocd/manifests/alloy-k8s/kustomization.yaml b/argocd/manifests/alloy-k8s/kustomization.yaml index 0326190..3503ead 100644 --- a/argocd/manifests/alloy-k8s/kustomization.yaml +++ b/argocd/manifests/alloy-k8s/kustomization.yaml @@ -10,7 +10,7 @@ resources: images: - name: registry.ops.eblu.me/blumeops/alloy - newTag: v1.16.0-26a3ab5 + newTag: v1.16.0-9564435 configMapGenerator: - name: alloy-config diff --git a/argocd/manifests/alloy-ringtail/kustomization.yaml b/argocd/manifests/alloy-ringtail/kustomization.yaml index cecae35..526fec5 100644 --- a/argocd/manifests/alloy-ringtail/kustomization.yaml +++ b/argocd/manifests/alloy-ringtail/kustomization.yaml @@ -10,7 +10,7 @@ resources: images: - name: registry.ops.eblu.me/blumeops/alloy - newTag: v1.16.0-26a3ab5-nix + newTag: v1.16.0-9564435-nix configMapGenerator: - name: alloy-config diff --git a/argocd/manifests/alloy-tracing-ringtail/kustomization.yaml b/argocd/manifests/alloy-tracing-ringtail/kustomization.yaml index ac25f4a..b1e6338 100644 --- a/argocd/manifests/alloy-tracing-ringtail/kustomization.yaml +++ b/argocd/manifests/alloy-tracing-ringtail/kustomization.yaml @@ -9,7 +9,7 @@ resources: images: - name: registry.ops.eblu.me/blumeops/alloy - newTag: v1.16.0-26a3ab5-nix + newTag: v1.16.0-9564435-nix configMapGenerator: - name: alloy-tracing-config diff --git a/docs/changelog.d/+alloy-main-sha-rebuild.infra.md b/docs/changelog.d/+alloy-main-sha-rebuild.infra.md new file mode 100644 index 0000000..42a7b37 --- /dev/null +++ b/docs/changelog.d/+alloy-main-sha-rebuild.infra.md @@ -0,0 +1,5 @@ +Rebuild and retag alloy v1.16.0 container images from the main-branch SHA +following the squash-merge of #345, per the build-container-image +squash-merge convention. Both images (`registry.ops.eblu.me/blumeops/alloy`) +now reference `9564435` rather than the branch SHA `26a3ab5`, restoring +source traceability after branch cleanup.