From f0749677bddd411c48ddb5fd8dbbd2769ee3ce37 Mon Sep 17 00:00:00 2001 From: rldyourmnd Date: Sat, 5 Sep 2026 02:37:05 +0500 Subject: [PATCH] feat(garm): point bootstrap image constants at container b27/b21 The Go-cache-seed bake published standard b27 and integration b21. GARM scale-set Image fields still used the previous literals until reconcile-garm --migrate-image; these constants are that contract. --- CHANGELOG.md | 3 +++ internal/garmbootstrap/types.go | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf2da8e4..d1e12838 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Point GARM bootstrap image constants at container standard b27 and + integration b21, matching the Go-cache-seed bake. + - Advance the baked Go cache seed to github-actions `b17a1ec`. The previous seed `b4a49eec` predates the current controller and provider tree, so a fleet `gha-fleet` compile was only a partial GOCACHE hit. Immutable aliases diff --git a/internal/garmbootstrap/types.go b/internal/garmbootstrap/types.go index 4eb48883..c0b3f8d7 100644 --- a/internal/garmbootstrap/types.go +++ b/internal/garmbootstrap/types.go @@ -36,17 +36,17 @@ const ( DefaultPoolBalancerType = "roundrobin" DefaultProviderName = "nddev-incus" DefaultImage = "nddev-ubuntu-24.04-amd64-container-current" - IntegrationImage = "nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b20" - PriorityStandardImage = "nddev-ubuntu-24.04-amd64-container-runner-2.336.0-r20260801-b26" - PriorityIntegrationImage = "nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b20" + IntegrationImage = "nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b21" + PriorityStandardImage = "nddev-ubuntu-24.04-amd64-container-runner-2.336.0-r20260801-b27" + PriorityIntegrationImage = "nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b21" // Every Linux class is an ephemeral Incus container. Docker-capable classes // use their nested-runtime image; release uses a separately stage-smoked // standard image so OIDC authority does not inherit Docker/nesting. FastImage = ContainerCanaryImage UntrustedImage = IntegrationImage - ReleaseImage = "nddev-ubuntu-24.04-amd64-container-runner-2.336.0-r20260801-b26" + ReleaseImage = "nddev-ubuntu-24.04-amd64-container-runner-2.336.0-r20260801-b27" ContainerCanaryImage = "nddev-ubuntu-24.04-amd64-container-current" - DockerContainerCanaryImage = "nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b20" + DockerContainerCanaryImage = "nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b21" DefaultFlavor = "nddev-linux-standard" IntegrationFlavor = "nddev-linux-integration" FastFlavor = "nddev-linux-fast"