From 70ab2b99409f89eb6ecbdfc7eabe4a8ebaa134e7 Mon Sep 17 00:00:00 2001 From: Thomas Kosiewski Date: Wed, 20 May 2026 11:34:30 +0200 Subject: [PATCH] chore: switch helm to aqua backend and bump dogfood mise (#25521) mise's aqua plugin now templates `{{.Version}}` with the leading `v`, so the official `get.helm.sh` URLs resolve without the hand-rolled `http:` workaround that was added when the version-prefix templating was broken. Drops the templated URL block (and its explanatory comment) in favor of plain `helm = "3.21.0"`. The regenerated lockfile picks up windows-amd64 (which the old workaround intentionally omitted) and replaces the locally-computed blake3 checksum with the upstream sha256 sums. Follow-up to #25520, which bumped the pinned version to 3.21. --------- Signed-off-by: Thomas Kosiewski Co-authored-by: Claude Opus 4.7 (1M context) --- dogfood/coder/ubuntu-22.04/Dockerfile | 4 +-- dogfood/coder/ubuntu-26.04/Dockerfile | 4 +-- mise.lock | 50 ++++++++++++++++++++++++--- mise.toml | 12 +------ 4 files changed, 50 insertions(+), 20 deletions(-) diff --git a/dogfood/coder/ubuntu-22.04/Dockerfile b/dogfood/coder/ubuntu-22.04/Dockerfile index 39703aff53..e40f5f868a 100644 --- a/dogfood/coder/ubuntu-22.04/Dockerfile +++ b/dogfood/coder/ubuntu-22.04/Dockerfile @@ -169,8 +169,8 @@ RUN useradd coder \ # volume mount; data dir under ~/.local/share/mise so installs ride # along on the per-workspace home volume, matching Homebrew's pattern # (see /home/linuxbrew volume in main.tf). -ARG MISE_VERSION=v2026.4.19 \ - MISE_SHA256=6b58ff5f1e1ce98ed2b7e5372c344ea48182c460e5b6df12d9e0def35aad4438 \ +ARG MISE_VERSION=v2026.5.12 \ + MISE_SHA256=a238972a3162d710b85b28c324372e96ca4e4b486c81fe78695000d9fbc77c48 \ MISE_INSTALL_DIR=/opt/mise/bin RUN install --directory --owner=coder --group=coder --mode=0755 "${MISE_INSTALL_DIR}" && \ curl --silent --show-error --location --fail \ diff --git a/dogfood/coder/ubuntu-26.04/Dockerfile b/dogfood/coder/ubuntu-26.04/Dockerfile index 9fe00ce879..47f66f0174 100644 --- a/dogfood/coder/ubuntu-26.04/Dockerfile +++ b/dogfood/coder/ubuntu-26.04/Dockerfile @@ -179,8 +179,8 @@ RUN userdel -r ubuntu && \ # volume mount; data dir under ~/.local/share/mise so installs ride # along on the per-workspace home volume, matching Homebrew's pattern # (see /home/linuxbrew volume in main.tf). -ARG MISE_VERSION=v2026.4.19 \ - MISE_SHA256=6b58ff5f1e1ce98ed2b7e5372c344ea48182c460e5b6df12d9e0def35aad4438 \ +ARG MISE_VERSION=v2026.5.12 \ + MISE_SHA256=a238972a3162d710b85b28c324372e96ca4e4b486c81fe78695000d9fbc77c48 \ MISE_INSTALL_DIR=/opt/mise/bin RUN install --directory --owner=coder --group=coder --mode=0755 "${MISE_INSTALL_DIR}" && \ curl --silent --show-error --location --fail \ diff --git a/mise.lock b/mise.lock index 71c8611efe..c63a3cf014 100644 --- a/mise.lock +++ b/mise.lock @@ -1,4 +1,4 @@ -# @generated - this file is auto-generated by `mise lock` https://mise.jdx.dev/dev-tools/mise-lock.html +# @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html [[tools."aqua:ahmetb/kubectx/kubens"]] version = "0.9.4" @@ -480,14 +480,54 @@ url = "https://github.com/golangci/golangci-lint/releases/download/v1.64.8/golan checksum = "sha256:54c2ed3a6b4f2f5da1056fb6e83d6b73b592e06684b65a5999174fabbb251a8f" url = "https://github.com/golangci/golangci-lint/releases/download/v1.64.8/golangci-lint-1.64.8-windows-amd64.zip" -[[tools."http:helm"]] +[[tools.helm]] version = "3.21.0" -backend = "http:helm" +backend = "aqua:helm/helm" -[tools."http:helm"."platforms.linux-x64"] -checksum = "blake3:c21872f94494e4f245140c5d274d212c68cf7db89d3ecfe1f080a1cd8585377f" +[tools.helm."platforms.linux-arm64"] +checksum = "sha256:8de5a0c9a47431e59fd560e91e0779c8cf9316c383da7efb84128a4c339ecb2d" +url = "https://get.helm.sh/helm-v3.21.0-linux-arm64.tar.gz" + +[tools.helm."platforms.linux-arm64-musl"] +checksum = "sha256:8de5a0c9a47431e59fd560e91e0779c8cf9316c383da7efb84128a4c339ecb2d" +url = "https://get.helm.sh/helm-v3.21.0-linux-arm64.tar.gz" + +[tools.helm."platforms.linux-x64"] +checksum = "sha256:0093eb572e3d2380f094df162ddb525e219249de88957afe24cfbb19632acd36" url = "https://get.helm.sh/helm-v3.21.0-linux-amd64.tar.gz" +[tools.helm."platforms.linux-x64-baseline"] +checksum = "sha256:0093eb572e3d2380f094df162ddb525e219249de88957afe24cfbb19632acd36" +url = "https://get.helm.sh/helm-v3.21.0-linux-amd64.tar.gz" + +[tools.helm."platforms.linux-x64-musl"] +checksum = "sha256:0093eb572e3d2380f094df162ddb525e219249de88957afe24cfbb19632acd36" +url = "https://get.helm.sh/helm-v3.21.0-linux-amd64.tar.gz" + +[tools.helm."platforms.linux-x64-musl-baseline"] +checksum = "sha256:0093eb572e3d2380f094df162ddb525e219249de88957afe24cfbb19632acd36" +url = "https://get.helm.sh/helm-v3.21.0-linux-amd64.tar.gz" + +[tools.helm."platforms.macos-arm64"] +checksum = "sha256:68bfbdc022c543a2a022597b20298216877e98abe6e4a345d3ecf114d79cae5f" +url = "https://get.helm.sh/helm-v3.21.0-darwin-arm64.tar.gz" + +[tools.helm."platforms.macos-x64"] +checksum = "sha256:8bc0c1f85f8738cc3cda4a2cc73047145bcdcb1f4d9cdcc29073037bfb22fa2e" +url = "https://get.helm.sh/helm-v3.21.0-darwin-amd64.tar.gz" + +[tools.helm."platforms.macos-x64-baseline"] +checksum = "sha256:8bc0c1f85f8738cc3cda4a2cc73047145bcdcb1f4d9cdcc29073037bfb22fa2e" +url = "https://get.helm.sh/helm-v3.21.0-darwin-amd64.tar.gz" + +[tools.helm."platforms.windows-x64"] +checksum = "sha256:5752d1777a9b3f96e3567bb844837904227741ae8c31ec178006f129c3c70936" +url = "https://get.helm.sh/helm-v3.21.0-windows-amd64.tar.gz" + +[tools.helm."platforms.windows-x64-baseline"] +checksum = "sha256:5752d1777a9b3f96e3567bb844837904227741ae8c31ec178006f129c3c70936" +url = "https://get.helm.sh/helm-v3.21.0-windows-amd64.tar.gz" + [[tools.kubectx]] version = "0.9.4" backend = "aqua:ahmetb/kubectx" diff --git a/mise.toml b/mise.toml index efaeb31a79..a09c86bc94 100644 --- a/mise.toml +++ b/mise.toml @@ -29,6 +29,7 @@ protoc-gen-go = "1.30.0" "aqua:ahmetb/kubectx/kubens" = "0.9.4" cosign = "2.4.3" golangci-lint = "1.64.8" +helm = "3.21.0" kubectx = "0.9.4" syft = "1.20.0" terraform = "1.15.2" @@ -52,17 +53,6 @@ lazygit = "0.61.1" # module's `command -v devcontainer` short-circuit fires "npm:@devcontainers/cli" = "0.87.0" -# helm publishes binaries at get.helm.sh, not on GitHub. Mise's aqua -# plugin templates the URL without the `v` prefix (404), and the -# github backend can't find the binary (helm only publishes signatures -# on GitHub). The http backend with a templated URL covers -# linux/macos cleanly. Windows is omitted (different extension); -# the dogfood image is linux/amd64-only and nobody on the team runs -# helm via mise on Windows. -[tools."http:helm"] -version = "3.21.0" -url = 'https://get.helm.sh/helm-v{{version}}-{{os(macos="darwin")}}-{{arch(x64="amd64")}}.tar.gz' - # sqlc (coder fork) bundles sqlite via cgo, so the `go install` build # needs CGO_ENABLED=1. Scope it with `install_env` so it only applies # during install. A top-level `[env]` would re-export CGO_ENABLED=1