From 8b27f25a25e4c4e1476c6d5707be68d31e5d832d Mon Sep 17 00:00:00 2001
From: Dom Del Nano <ddelnano@gmail.com>
Date: Mon, 8 Dec 2025 16:39:43 +0000
Subject: [PATCH 1/2] Replace raw use of bazel with bazelisk

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
(cherry picked from commit 57710ed649e76afd31ff17cd0efe42abf4fb2f92)
---
 docker.properties                                        | 8 ++++----
 tools/chef/base_image_version.txt                        | 2 +-
 tools/chef/cookbooks/px_dev/attributes/linux.rb          | 8 ++++----
 tools/chef/cookbooks/px_dev/attributes/mac_os_x.rb       | 8 ++++----
 tools/chef/cookbooks/px_dev/recipes/linters.rb           | 4 ++--
 tools/chef/cookbooks/px_dev/templates/bazel.erb          | 4 ++--
 tools/chef/cookbooks/px_dev_extras/attributes/default.rb | 3 ---
 tools/chef/cookbooks/px_dev_extras/recipes/default.rb    | 6 ------
 8 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/docker.properties b/docker.properties
index 82ea19c1351..1b1de26c417 100644
--- a/docker.properties
+++ b/docker.properties
@@ -1,4 +1,4 @@
-DOCKER_IMAGE_TAG=202508131912
-LINTER_IMAGE_DIGEST=db3238ae3ab3f0fe307aef8920a29b5f0df808248c16a1650baa228c4cefbd4c
-DEV_IMAGE_DIGEST=42c7f00b68db0835c266c5aceb6f67ec7e43342336f95218af14e19858e08854
-DEV_IMAGE_WITH_EXTRAS_DIGEST=bbcd6dc6d269231163be9782d42bdf2b2855a34ab384a853fa67e13e946948ec
+DOCKER_IMAGE_TAG=202512081623
+LINTER_IMAGE_DIGEST=b21bc41ec975ed48ef73f3888c17044b7a6ab0558cc8fb83a837928f9f540a05
+DEV_IMAGE_DIGEST=8b9bb04c2db41988cea0627599715a6f7e6834ca05cca30691cba59c7fe47eba
+DEV_IMAGE_WITH_EXTRAS_DIGEST=6dc422b99c32b297915c771449f80fc5aecdd1ac8fecad22e39ff20b73321f53
diff --git a/tools/chef/base_image_version.txt b/tools/chef/base_image_version.txt
index f8fcc96b15e..916fc83b854 100644
--- a/tools/chef/base_image_version.txt
+++ b/tools/chef/base_image_version.txt
@@ -1 +1 @@
-202503281433
+202512082132
diff --git a/tools/chef/cookbooks/px_dev/attributes/linux.rb b/tools/chef/cookbooks/px_dev/attributes/linux.rb
index 2087ba5dbfb..7af82f14002 100644
--- a/tools/chef/cookbooks/px_dev/attributes/linux.rb
+++ b/tools/chef/cookbooks/px_dev/attributes/linux.rb
@@ -22,10 +22,10 @@
 default['owner'] = 'root'
 default['group'] = 'root'
 
-default['bazel']['download_path'] =
-  "https://github.com/bazelbuild/bazel/releases/download/6.2.0/bazel-6.2.0-linux-x86_64"
-default['bazel']['sha256'] =
-  '3d11c26fb9ba12c833844450bb90165b176e8a19cb5cf5923f3cec855837f17c'
+default['bazelisk']['download_path'] =
+  "https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-linux-amd64"
+default['bazelisk']['sha256'] =
+  'e1508323f347ad1465a887bc5d2bfb91cffc232d11e8e997b623227c6b32fb76'
 
 default['codecov']['download_path'] =
   'https://uploader.codecov.io/v0.2.3/linux/codecov'
diff --git a/tools/chef/cookbooks/px_dev/attributes/mac_os_x.rb b/tools/chef/cookbooks/px_dev/attributes/mac_os_x.rb
index f4b429f74ba..0df3d4e58ac 100644
--- a/tools/chef/cookbooks/px_dev/attributes/mac_os_x.rb
+++ b/tools/chef/cookbooks/px_dev/attributes/mac_os_x.rb
@@ -23,10 +23,10 @@
 default['owner'] = node['current_user']
 default['group'] = 'wheel'
 
-default['bazel']['download_path'] =
-  "https://github.com/bazelbuild/bazel/releases/download/6.2.0/bazel-6.2.0-darwin-x86_64"
-default['bazel']['sha256'] =
-  'd2356012843ce3a2fbba89f88191673a6ad2f7716cc46ad43ec1bcee78d36b44'
+default['bazelisk']['download_path'] =
+  "https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-darwin-amd64"
+default['bazelisk']['sha256'] =
+  '8fcd7ba828f673ba4b1529425e01e15ac42599ef566c17f320d8cbfe7b96a167'
 
 default['codecov']['download_path'] =
   'https://uploader.codecov.io/v0.2.3/macos/codecov'
diff --git a/tools/chef/cookbooks/px_dev/recipes/linters.rb b/tools/chef/cookbooks/px_dev/recipes/linters.rb
index 0ec7775a9a1..d59050bd2bc 100644
--- a/tools/chef/cookbooks/px_dev/recipes/linters.rb
+++ b/tools/chef/cookbooks/px_dev/recipes/linters.rb
@@ -47,8 +47,8 @@
   action :create
 end
 
-common_remote_bin 'bazel' do
-  bin_name 'bazel_core'
+common_remote_bin 'bazelisk' do
+  bin_name 'bazelisk'
 end
 
 if platform_family?('debian')
diff --git a/tools/chef/cookbooks/px_dev/templates/bazel.erb b/tools/chef/cookbooks/px_dev/templates/bazel.erb
index 5b3b9573ffa..eef1189bed0 100755
--- a/tools/chef/cookbooks/px_dev/templates/bazel.erb
+++ b/tools/chef/cookbooks/px_dev/templates/bazel.erb
@@ -19,7 +19,7 @@
 #    * Adds a --config=clang by default if it's missing from the command line.
 # Check if this is this pixie repo, otherwise just passthrough to bazel_core.
 if ! grep 'workspace(name\s=\s"px")' "$(git rev-parse --show-toplevel 2> /dev/null)/WORKSPACE" &> /dev/null; then
-  /opt/px_dev/bin/bazel_core "$@"
+  /opt/px_dev/bin/bazelisk "$@"
   exit $?
 fi;
 
@@ -36,4 +36,4 @@ fi;
 cmd=$1
 shift
 
-/opt/px_dev/bin/bazel_core ${cmd:+"$cmd"} ${config:+"$config"} "$@"
+/opt/px_dev/bin/bazelisk ${cmd:+"$cmd"} ${config:+"$config"} "$@"
diff --git a/tools/chef/cookbooks/px_dev_extras/attributes/default.rb b/tools/chef/cookbooks/px_dev_extras/attributes/default.rb
index 5b672f6b597..3892ab9e93f 100644
--- a/tools/chef/cookbooks/px_dev_extras/attributes/default.rb
+++ b/tools/chef/cookbooks/px_dev_extras/attributes/default.rb
@@ -14,6 +14,3 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-default['bazel']['zsh_completions']  =
-  "https://raw.githubusercontent.com/bazelbuild/bazel/6.0.0/scripts/zsh_completion/_bazel"
-default['bazel']['zcomp_sha256']     = '4094dc84add2f23823bc341186adf6b8487fbd5d4164bd52d98891c41511eba4'
diff --git a/tools/chef/cookbooks/px_dev_extras/recipes/default.rb b/tools/chef/cookbooks/px_dev_extras/recipes/default.rb
index d74de0e7f5f..928218669b6 100644
--- a/tools/chef/cookbooks/px_dev_extras/recipes/default.rb
+++ b/tools/chef/cookbooks/px_dev_extras/recipes/default.rb
@@ -40,12 +40,6 @@
   homebrew_package pkg_list
 end
 
-remote_file '/usr/local/share/zsh/site-functions/_bazel' do
-  source node['bazel']['zsh_completions']
-  mode 0644
-  checksum node['bazel']['zcomp_sha256']
-end
-
 common_remote_bin 'faq'
 common_remote_bin 'kubectl'
 common_remote_tar_bin 'kustomize'

From 89b22fb2e8aba1d6ff80264a69908056739ea887 Mon Sep 17 00:00:00 2001
From: Dom Del Nano <ddelnano@gmail.com>
Date: Tue, 9 Dec 2025 14:49:03 +0000
Subject: [PATCH 2/2] Keep bazel's zsh completions install

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
---
 docker.properties                                        | 8 ++++----
 tools/chef/base_image_version.txt                        | 2 +-
 tools/chef/cookbooks/px_dev_extras/attributes/default.rb | 4 ++++
 tools/chef/cookbooks/px_dev_extras/recipes/default.rb    | 6 ++++++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/docker.properties b/docker.properties
index 1b1de26c417..bb7696c727f 100644
--- a/docker.properties
+++ b/docker.properties
@@ -1,4 +1,4 @@
-DOCKER_IMAGE_TAG=202512081623
-LINTER_IMAGE_DIGEST=b21bc41ec975ed48ef73f3888c17044b7a6ab0558cc8fb83a837928f9f540a05
-DEV_IMAGE_DIGEST=8b9bb04c2db41988cea0627599715a6f7e6834ca05cca30691cba59c7fe47eba
-DEV_IMAGE_WITH_EXTRAS_DIGEST=6dc422b99c32b297915c771449f80fc5aecdd1ac8fecad22e39ff20b73321f53
+DOCKER_IMAGE_TAG=202512082352
+LINTER_IMAGE_DIGEST=441fc5a65697dab0b38627d5afde9e38da6812f1a5b98732b224161c23238e73
+DEV_IMAGE_DIGEST=cac2e8a1c3e70dde4e5089b2383b2e11cc022af467ee430c12416eb42066fbb7
+DEV_IMAGE_WITH_EXTRAS_DIGEST=e84f82d62540e1ca72650f8f7c9c4fe0b32b64a33f04cf0b913b9961527c9e30
diff --git a/tools/chef/base_image_version.txt b/tools/chef/base_image_version.txt
index 916fc83b854..ebb1d31c4f4 100644
--- a/tools/chef/base_image_version.txt
+++ b/tools/chef/base_image_version.txt
@@ -1 +1 @@
-202512082132
+202512091427
diff --git a/tools/chef/cookbooks/px_dev_extras/attributes/default.rb b/tools/chef/cookbooks/px_dev_extras/attributes/default.rb
index 3892ab9e93f..66c7a0e5840 100644
--- a/tools/chef/cookbooks/px_dev_extras/attributes/default.rb
+++ b/tools/chef/cookbooks/px_dev_extras/attributes/default.rb
@@ -14,3 +14,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# Fetch bazel version from Pixie's .bazelversion on main branch
+bazel_version = Chef::HTTP.new('https://raw.githubusercontent.com').get('/pixie-io/pixie/main/.bazelversion').strip
+default['bazel']['zsh_completions'] =
+  "https://raw.githubusercontent.com/bazelbuild/bazel/#{bazel_version}/scripts/zsh_completion/_bazel"
diff --git a/tools/chef/cookbooks/px_dev_extras/recipes/default.rb b/tools/chef/cookbooks/px_dev_extras/recipes/default.rb
index 928218669b6..9e98de95d9e 100644
--- a/tools/chef/cookbooks/px_dev_extras/recipes/default.rb
+++ b/tools/chef/cookbooks/px_dev_extras/recipes/default.rb
@@ -40,6 +40,12 @@
   homebrew_package pkg_list
 end
 
+remote_file '/usr/local/share/zsh/site-functions/_bazel' do
+  source node['bazel']['zsh_completions']
+  mode '0644'
+  action :create
+end
+
 common_remote_bin 'faq'
 common_remote_bin 'kubectl'
 common_remote_tar_bin 'kustomize'