From 40af1701a64b50743e2d2ef164e9cdea6d98984e Mon Sep 17 00:00:00 2001
From: Apoorv Kothari <apoorv@buoyant.io>
Date: Tue, 27 Oct 2026 10:36:22 -0700
Subject: [PATCH 1/2] chore: update go version to 1.26.10

Signed-off-by: Apoorv Kothari <apoorv@buoyant.io>
---
 Dockerfile      |  5 +++--
 k3s-images.json | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 09a76d1..a96d5b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@
 ##
 
 
-ARG GO_TAG=1.26
+ARG GO_TAG=1.26.10
 ARG RUST_TAG=1.90.0
 ARG DEBIAN_RELEASE=trixie
 
@@ -252,7 +252,8 @@ FROM docker.io/library/golang:${GO_TAG} as goplay
 RUN go install github.com/haya14busa/goplay/cmd/goplay@latest
 
 FROM docker.io/library/golang:${GO_TAG} as gopls
-RUN go install golang.org/x/tools/gopls@latest
+# gopls newer than v0.23.0 requires Go 1.27.
+RUN go install golang.org/x/tools/gopls@v0.23.0
 
 FROM docker.io/library/golang:${GO_TAG} as gotests
 RUN go install github.com/cweill/gotests/gotests@latest
diff --git a/k3s-images.json b/k3s-images.json
index a77cf56..9684ba0 100644
--- a/k3s-images.json
+++ b/k3s-images.json
@@ -1,23 +1,23 @@
 {
   "name": "docker.io/rancher/k3s",
   "channels": {
-    "stable": "v1.36.4-k3s1",
-    "latest": "v1.37.0-k3s1",
+    "stable": "v1.36.5-k3s1",
+    "latest": "v1.37.1-k3s1",
     "v1.31": "v1.31.14-k3s1",
     "v1.32": "v1.32.13-k3s1",
     "v1.33": "v1.33.13-k3s2",
-    "v1.34": "v1.34.11-k3s1",
-    "v1.35": "v1.35.8-k3s1",
-    "v1.36": "v1.36.4-k3s1",
-    "v1.37": "v1.37.0-k3s1"
+    "v1.34": "v1.34.12-k3s1",
+    "v1.35": "v1.35.9-k3s1",
+    "v1.36": "v1.36.5-k3s1",
+    "v1.37": "v1.37.1-k3s1"
   },
   "digests": {
     "v1.31.14-k3s1": "sha256:6c33f6a8ff6dd6ae63428d5c8e331e059a4111d5ec3f5beaa9df6c50ba6b7ce8",
     "v1.32.13-k3s1": "sha256:7534b63e02277917f77c584ed5532b31562c760d6bb8fe88059002e9bdeee033",
     "v1.33.13-k3s2": "sha256:ada5ff2e138120efe877f76d514dedda65b304122112b982eab532732c028c89",
-    "v1.34.11-k3s1": "sha256:5d52389a0f4fd7ebdb5a1fb2d7c67c35da966230782c4abb0667d86bcccea9c2",
-    "v1.35.8-k3s1": "sha256:59fe491fd3b73204e499e40b325240d85c42c7189c3ae50150d37b78243f3b32",
-    "v1.36.4-k3s1": "sha256:edad48e12bf81c3a09ac1c05c0c0ffaaa22145980b989d6fae84543a76b83657",
-    "v1.37.0-k3s1": "sha256:d33b1973401a60410681d66c007f5c3a51d565a7c03608904764aef3321fee4d"
+    "v1.34.12-k3s1": "sha256:4ea0adb6b0ffedab0c58ffe5c99a49f2f7be871f38636c8baa2692899648d8c5",
+    "v1.35.9-k3s1": "sha256:ec9868c6a38d4e8c1869832fb5fd1eb8473c39794a0b44d2b952e7ba911951bc",
+    "v1.36.5-k3s1": "sha256:057cfd5a9d51b89f1f0ee139c28d5d5fdd5aa7ddeac2742a0ba90c6dbc0329bb",
+    "v1.37.1-k3s1": "sha256:ca7f37d993d82ef0dcdcfecb2e0e2618ea541dbaffc620c8cedebe01a82acd0d"
   }
 }

From 01ec8ffecb3a41072bf84738dfd2aee96b126f8c Mon Sep 17 00:00:00 2001
From: Apoorv Kothari <apoorv@buoyant.io>
Date: Tue, 27 Oct 2026 10:36:53 -0700
Subject: [PATCH 2/2] build: v52

Signed-off-by: Apoorv Kothari <apoorv@buoyant.io>
---
 .devcontainer/devcontainer.json | 2 +-
 actions/setup-tools/action.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5664b43..95be8b2 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "linkerd-dev",
-    "image": "ghcr.io/linkerd/dev:v51",
+    "image": "ghcr.io/linkerd/dev:v52",
     "customizations": {
         "vscode": {
             "extensions": [
diff --git a/actions/setup-tools/action.yml b/actions/setup-tools/action.yml
index d7fb4c1..9b7ad6f 100644
--- a/actions/setup-tools/action.yml
+++ b/actions/setup-tools/action.yml
@@ -5,7 +5,7 @@ inputs:
   # TODO(ver): CI should validate at this version matches the most recent release tag
   version:
     description: Container image version
-    default: v51
+    default: v52
 
 runs:
   using: composite