From ed66192fe6f2d1b2c09019ff3f04abfaf3cc8e13 Mon Sep 17 00:00:00 2001
From: Andrew Stucki <andrew.stucki@redpanda.com>
Date: Wed, 22 Apr 2026 09:42:15 -0400
Subject: [PATCH 1/3] Fix controller-gen sha and architectures for new build
 runners

---
 ci/rp-controller-gen.nix | 2 +-
 taskfiles/k8s.yml        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci/rp-controller-gen.nix b/ci/rp-controller-gen.nix
index ea3176028..24a985cc4 100644
--- a/ci/rp-controller-gen.nix
+++ b/ci/rp-controller-gen.nix
@@ -12,7 +12,7 @@ buildGo126Module rec {
     owner = "redpanda-data";
     repo = "common-go";
     rev = "${version}";
-    hash = "sha256-KoVBYGE0pkXpcPb+8145Wmu0m8lex8hc8c0QzFVzhho=";
+    hash = "sha256-34oDV8HFbTd5w34Kf1bVVuRIo3nXnVJlkQnbwh9A5GQ=";
   };
 
   vendorHash = "sha256-PIKAvpLy0tTYkkzxg1UvHhDMhQGysPQ06k1J+5llN84=";
diff --git a/taskfiles/k8s.yml b/taskfiles/k8s.yml
index 45e64b55b..d4665028a 100644
--- a/taskfiles/k8s.yml
+++ b/taskfiles/k8s.yml
@@ -173,9 +173,10 @@ tasks:
       REPO: '{{.REPO | default "docker.redpanda.com/redpandadata/redpanda"}}'
     cmds:
       - |
+        ARCH=$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/')
         TAG=$(docker-tag-list -c "{{.CONSTRAINT}}" --latest -r "{{.REPO}}" | sed 's/-a..64$//')
-        docker pull "{{.REPO}}":"${TAG}"
-        docker tag "{{.REPO}}":"${TAG}" localhost/redpanda:dev
+        docker pull "{{.REPO}}":"${TAG}-${ARCH}"
+        docker tag  "{{.REPO}}":"${TAG}-${ARCH}" localhost/redpanda:dev
 
   run-kuttl-tests:
     desc: run kuttl tests

From 8f69431dcf19a5ca68937f120b1ba2aec19a248c Mon Sep 17 00:00:00 2001
From: Andrew Stucki <andrew.stucki@redpanda.com>
Date: Wed, 22 Apr 2026 09:53:48 -0400
Subject: [PATCH 2/3] Update nix in CI

---
 ci/docker/nix.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/docker/nix.Dockerfile b/ci/docker/nix.Dockerfile
index 256700fb2..2fa76256a 100644
--- a/ci/docker/nix.Dockerfile
+++ b/ci/docker/nix.Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM nixos/nix:2.28.2
+FROM nixos/nix:2.30.2
 
 WORKDIR "/work"
 

From 91cbfbf584545499e1446413071a69895c58bc12 Mon Sep 17 00:00:00 2001
From: Andrew Stucki <andrew.stucki@redpanda.com>
Date: Wed, 22 Apr 2026 10:10:35 -0400
Subject: [PATCH 3/3] revert nix changes since it's an issue in upstream
 common-go

---
 ci/docker/nix.Dockerfile | 2 +-
 ci/rp-controller-gen.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/docker/nix.Dockerfile b/ci/docker/nix.Dockerfile
index 2fa76256a..256700fb2 100644
--- a/ci/docker/nix.Dockerfile
+++ b/ci/docker/nix.Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM nixos/nix:2.30.2
+FROM nixos/nix:2.28.2
 
 WORKDIR "/work"
 
diff --git a/ci/rp-controller-gen.nix b/ci/rp-controller-gen.nix
index 24a985cc4..ea3176028 100644
--- a/ci/rp-controller-gen.nix
+++ b/ci/rp-controller-gen.nix
@@ -12,7 +12,7 @@ buildGo126Module rec {
     owner = "redpanda-data";
     repo = "common-go";
     rev = "${version}";
-    hash = "sha256-34oDV8HFbTd5w34Kf1bVVuRIo3nXnVJlkQnbwh9A5GQ=";
+    hash = "sha256-KoVBYGE0pkXpcPb+8145Wmu0m8lex8hc8c0QzFVzhho=";
   };
 
   vendorHash = "sha256-PIKAvpLy0tTYkkzxg1UvHhDMhQGysPQ06k1J+5llN84=";