From fdac48f07f1e4aabab713fdd5594483924ddb42a Mon Sep 17 00:00:00 2001
From: Amin Jamali <amin.jamali@broadcom.com>
Date: Fri, 31 Jul 2026 18:00:12 +0000
Subject: [PATCH] Remove garden-runc submodules

use standalone guardian module introduced here (https://github.com/cloudfoundry/guardian/pull/512)
---
 .gitmodules                                   | 13 ---------
 src/code.cloudfoundry.org/go.mod              | 19 ++++++-------
 src/code.cloudfoundry.org/go.sum              | 28 +++++++++++--------
 src/code.cloudfoundry.org/inigo/bin/test.bash |  4 +--
 src/code.cloudfoundry.org/inigo/bin/test.ps1  |  3 +-
 .../inigo/cell/cell_suite_test.go             | 10 +++----
 .../inigo/executor/executor_suite_test.go     | 11 ++------
 .../inigo/volman/volman_suite_test.go         |  7 ++---
 .../code.cloudfoundry.org/garden/README.md    |  3 +-
 .../guardian/rundmc/containerizer.go          |  3 +-
 src/code.cloudfoundry.org/vendor/modules.txt  | 20 ++++++-------
 src/garden                                    |  1 -
 src/grootfs                                   |  1 -
 src/guardian                                  |  1 -
 src/idmapper                                  |  1 -
 15 files changed, 47 insertions(+), 78 deletions(-)
 delete mode 160000 src/garden
 delete mode 160000 src/grootfs
 delete mode 160000 src/guardian
 delete mode 160000 src/idmapper

diff --git a/.gitmodules b/.gitmodules
index 66b6b296a7..afa7f8876b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,16 +1,3 @@
 [submodule "src/code.cloudfoundry.org/credhub-cli"]
 	path = src/code.cloudfoundry.org/credhub-cli
 	url = https://github.com/cloudfoundry-incubator/credhub-cli/
-[submodule "src/grootfs"]
-	path = src/grootfs
-	url = https://github.com/cloudfoundry/grootfs
-[submodule "src/guardian"]
-	path = src/guardian
-	url = https://github.com/cloudfoundry/guardian
-	branch = main
-[submodule "src/idmapper"]
-	path = src/idmapper
-	url = https://github.com/cloudfoundry/idmapper
-[submodule "src/garden"]
-	path = src/garden
-	url = https://github.com/cloudfoundry/garden
diff --git a/src/code.cloudfoundry.org/go.mod b/src/code.cloudfoundry.org/go.mod
index 4f5c76fc8f..51133d0e64 100644
--- a/src/code.cloudfoundry.org/go.mod
+++ b/src/code.cloudfoundry.org/go.mod
@@ -3,17 +3,13 @@ module code.cloudfoundry.org
 go 1.26.6
 
 replace (
-	code.cloudfoundry.org/garden => ../garden
-	code.cloudfoundry.org/grootfs => ../grootfs
-	code.cloudfoundry.org/guardian => ../guardian
-	code.cloudfoundry.org/idmapper => ../idmapper
 	github.com/cactus/go-statsd-client => github.com/cactus/go-statsd-client v2.0.2-0.20150911070441-6fa055a7b594+incompatible
 	// pin ifrit until https://github.com/tedsuo/ifrit/pull/48 is merged
 	github.com/tedsuo/ifrit => github.com/tedsuo/ifrit v0.0.0-20260418191334-846868129986
 )
 
 require (
-	code.cloudfoundry.org/archiver v0.85.0
+	code.cloudfoundry.org/archiver v0.86.0
 	code.cloudfoundry.org/bbs v1.12.0
 	code.cloudfoundry.org/bbs/encryption v1.9.0
 	code.cloudfoundry.org/bbs/format v1.9.0
@@ -24,17 +20,17 @@ require (
 	code.cloudfoundry.org/clock v1.86.0
 	code.cloudfoundry.org/cnbapplifecycle v0.0.8
 	code.cloudfoundry.org/credhub-cli v0.0.0-20260824191323-ca2ae25cb1f8
-	code.cloudfoundry.org/debugserver v0.112.0
+	code.cloudfoundry.org/debugserver v0.113.0
 	code.cloudfoundry.org/diego-logging-client v0.122.0
 	code.cloudfoundry.org/dockerdriver v0.104.0
 	code.cloudfoundry.org/durationjson v0.87.0
 	code.cloudfoundry.org/eventhub v0.87.0
-	code.cloudfoundry.org/garden v0.0.0-20260826021137-674e52f7c65b
+	code.cloudfoundry.org/garden v0.2.0
 	code.cloudfoundry.org/go-loggregator/v9 v9.2.1
 	code.cloudfoundry.org/goshims v0.110.0
-	code.cloudfoundry.org/guardian v0.0.0-20260820194234-c2d9348cfdee
-	code.cloudfoundry.org/lager/v3 v3.84.0
-	code.cloudfoundry.org/localip v0.86.0
+	code.cloudfoundry.org/guardian v0.0.0-20260902161120-8a4bd5473238
+	code.cloudfoundry.org/lager/v3 v3.85.0
+	code.cloudfoundry.org/localip v0.87.0
 	code.cloudfoundry.org/locket v1.10.0
 	code.cloudfoundry.org/routing-api v0.12.0
 	code.cloudfoundry.org/routing-info v1.11.0
@@ -162,7 +158,7 @@ require (
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/go-containerregistry v0.22.0 // indirect
 	github.com/google/go-tpm v0.9.8 // indirect
-	github.com/google/pprof v0.0.0-20260830191439-4932ad3515ea // indirect
+	github.com/google/pprof v0.0.0-20260902005441-ca85771921e4 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/hashicorp/go-version v1.9.0 // indirect
@@ -190,6 +186,7 @@ require (
 	github.com/moby/sys/reexec v0.1.0 // indirect
 	github.com/moby/sys/user v0.4.1 // indirect
 	github.com/moby/sys/userns v0.2.0 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/nats-io/jwt/v2 v2.8.2 // indirect
 	github.com/nats-io/nkeys v0.4.16 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
diff --git a/src/code.cloudfoundry.org/go.sum b/src/code.cloudfoundry.org/go.sum
index 095f309a2f..8a9c006b83 100644
--- a/src/code.cloudfoundry.org/go.sum
+++ b/src/code.cloudfoundry.org/go.sum
@@ -594,8 +594,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS
 cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M=
 cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
 cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
-code.cloudfoundry.org/archiver v0.85.0 h1:UVKJ87oGraRzyFmyKcswQbdGCFrGIooPV43ZSY1X6Cg=
-code.cloudfoundry.org/archiver v0.85.0/go.mod h1:09B8Yi7R9OVtFw780PvQQNFczOVq8VrvmJm51CXIsw8=
+code.cloudfoundry.org/archiver v0.86.0 h1:E2Cxx08HWAHtKNj4ppigpfVF8rPYMH3qMGNltV5PAZ4=
+code.cloudfoundry.org/archiver v0.86.0/go.mod h1:scmfEinzWdbEXU5V9u/z8Z7biJuGM/+cJRPHfQN/YBA=
 code.cloudfoundry.org/bbs v1.12.0 h1:foVUcmkpcsxD7HfHspX4MqInkQjrkvjNhfl8cBoAYeo=
 code.cloudfoundry.org/bbs v1.12.0/go.mod h1:W1lOv4rv4+hvNcR9iXAh+qCM9zzse42f02GUPdn9r/c=
 code.cloudfoundry.org/bbs/encryption v1.9.0 h1:1IiWKO4nqJonCi0JeoIVobPsTE8FRhbB9Fq1MRTikEA=
@@ -618,8 +618,8 @@ code.cloudfoundry.org/commandrunner v0.73.0 h1:Ww3JD0RKepLboSii0dWZU8rSLuPey4wS3
 code.cloudfoundry.org/commandrunner v0.73.0/go.mod h1:RMtGRHGmKTlvKOS3vZDakn+pbdkt6y8Bbyqn19UkApw=
 code.cloudfoundry.org/credhub-cli v0.0.0-20260824191323-ca2ae25cb1f8 h1:IwnJFwswFNJSeqRBgcJlGobc7wVqEbuwdWvUYE0K84A=
 code.cloudfoundry.org/credhub-cli v0.0.0-20260824191323-ca2ae25cb1f8/go.mod h1:P7Khp9dVTOQYY13rPn4qK3n5agfLP0K4YR3BgRJXtP0=
-code.cloudfoundry.org/debugserver v0.112.0 h1:AhWE+G/mivfsvX/KdVU5LcPr3WXY1DRD2yDUzkytxDs=
-code.cloudfoundry.org/debugserver v0.112.0/go.mod h1:7HgnHVvZKzniSSQww4JtsJhoH2nvX+qqxA9Kk2sxHhk=
+code.cloudfoundry.org/debugserver v0.113.0 h1:VHAZXXMsXEXcAB3jtBfcOz3fMizHMlH65OzV+19SceA=
+code.cloudfoundry.org/debugserver v0.113.0/go.mod h1:1infVlb0zqdtXDQnkjJF1WJkQr/0g2pvAeel+M3Lc9Q=
 code.cloudfoundry.org/diego-db-helpers v0.12.0 h1:scxmQJsqZRq9UfBtdQiebHWwZ92mz0P21iLaHPlRx1A=
 code.cloudfoundry.org/diego-db-helpers v0.12.0/go.mod h1:MX5XaX9iDxmtBGjvFS6I8vl5PpAxwnH/8f01dVKSpks=
 code.cloudfoundry.org/diego-logging-client v0.122.0 h1:079X/Q3AJ9x5BWviRgcoK3wvdYV5rEarJl3N6p7BIaY=
@@ -630,16 +630,20 @@ code.cloudfoundry.org/durationjson v0.87.0 h1:gvCXgMyMNcobSX6MDdmPyT9YKAFJYWhIvS
 code.cloudfoundry.org/durationjson v0.87.0/go.mod h1:Sx/UMN5OEybm6ksKyUxwsZvD92KZOBVnrOEQHavW3Cc=
 code.cloudfoundry.org/eventhub v0.87.0 h1:qOTb0Mw99y8cCHzTD67F2cMWQOzqYGHM23z3XB2xybE=
 code.cloudfoundry.org/eventhub v0.87.0/go.mod h1:Hv8pTgYB5Iw2Lko8sd8KxS2dVwl75fUEbLgRqFBfDWM=
+code.cloudfoundry.org/garden v0.2.0 h1:wgvHo1zmMywzGMUJhQuS1zvZw/hgGLqCwSqxiEWLzCs=
+code.cloudfoundry.org/garden v0.2.0/go.mod h1:C48Lw/gXbiyRugETUKDSRE1vz7HEJUtBNyDt1RCJ8Xw=
 code.cloudfoundry.org/go-diodes v0.0.0-20260831145205-e8366a756183 h1:LUSKGl8Wyfomxk6oX166AzJLObAeQbtjNfBuEcnKnbs=
 code.cloudfoundry.org/go-diodes v0.0.0-20260831145205-e8366a756183/go.mod h1:/1BMivaq1Chyx2UC+T3cXrPZJnFjZ60vz5BYE9h/TNU=
 code.cloudfoundry.org/go-loggregator/v9 v9.2.1 h1:S6Lgg5UJbhh2bt2TGQxs6R00CF8PrUA3GFPYDxy56Fk=
 code.cloudfoundry.org/go-loggregator/v9 v9.2.1/go.mod h1:FTFFruqGeOhVCDFvyLgl8EV8YW63NNwRzLhxJcporu8=
 code.cloudfoundry.org/goshims v0.110.0 h1:2rSz4U8HIaBaJMDpfy65XHE0xnQoUOogKPgvh40tflk=
 code.cloudfoundry.org/goshims v0.110.0/go.mod h1:AJonkJaHrfgNiThRB6iYC0xQoqrSKEBYG2zQGToMkio=
-code.cloudfoundry.org/lager/v3 v3.84.0 h1:us7j6umD2hzLZwk1jjzEPHgvpYFClYZ8ucxeLjZdBiw=
-code.cloudfoundry.org/lager/v3 v3.84.0/go.mod h1:3e2EcI09jM+xBskLCaue0NWnfSEal8t4bBqYMOJ6yCA=
-code.cloudfoundry.org/localip v0.86.0 h1:25b9njv404T5SuChRnZXRnE5xr2yaAneTYcOuNZUBxk=
-code.cloudfoundry.org/localip v0.86.0/go.mod h1:oNoVlrT3DDEyrcVHP9aEf9Xms+ekTeR3EAHKA50jrh8=
+code.cloudfoundry.org/guardian v0.0.0-20260902161120-8a4bd5473238 h1:MnQzi52AKkw2wzEkoWrNiznHMx03PkbU43jFjIDc8bc=
+code.cloudfoundry.org/guardian v0.0.0-20260902161120-8a4bd5473238/go.mod h1:8+KtqZJlcnFnXpDOsxBacwVN0enSMtQ7iKRbEeq0ezk=
+code.cloudfoundry.org/lager/v3 v3.85.0 h1:4AebS51o+48Pxaba53K7ehogN8XJoKuW9ZEtq6Kjm4Y=
+code.cloudfoundry.org/lager/v3 v3.85.0/go.mod h1:R04ztm9KdIqZ0XaZa8q9+dt7+jgdmgiunKWINfNvPc0=
+code.cloudfoundry.org/localip v0.87.0 h1:9dJPoIZT5O+HozeGH6QY3clfl0aVzy9zPz6i0UfuFW4=
+code.cloudfoundry.org/localip v0.87.0/go.mod h1:5LYKIsvfHkbjbWQDQwdi10vIql5OCFBQpPyNbw5fAOg=
 code.cloudfoundry.org/locket v1.10.0 h1:J45UbwAU8GFGVhumg7pQxkbkjK+fV+kmO36dm2ia1hg=
 code.cloudfoundry.org/locket v1.10.0/go.mod h1:Kz0ub2ZSz6tRADJZg9CtegzIuluw+bgOhxv5IlbJ5RM=
 code.cloudfoundry.org/routing-api v0.12.0 h1:rP5YXDWI3EP5fOHCIDFTDZm9RQjGuvbvtZyQjK18uWw=
@@ -1046,8 +1050,8 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20260830191439-4932ad3515ea h1:nItRa0lOM9n5+PZiNPdBI2RjLCZoBrhWqKDJuB3+gSU=
-github.com/google/pprof v0.0.0-20260830191439-4932ad3515ea/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk=
+github.com/google/pprof v0.0.0-20260902005441-ca85771921e4 h1:/6mPXfWmhv8eKck12I0YNIcIjwHtxP3YRIMKiEgTjWg=
+github.com/google/pprof v0.0.0-20260902005441-ca85771921e4/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
@@ -1214,8 +1218,8 @@ github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
 github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
+github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nats-io/jwt/v2 v2.8.2 h1:XXRgB60MSTnqsRwejQurVDs/hcv2dkt+86GjI+I/bMc=
diff --git a/src/code.cloudfoundry.org/inigo/bin/test.bash b/src/code.cloudfoundry.org/inigo/bin/test.bash
index b0fabb0975..fcd092bc5a 100755
--- a/src/code.cloudfoundry.org/inigo/bin/test.bash
+++ b/src/code.cloudfoundry.org/inigo/bin/test.bash
@@ -30,6 +30,7 @@ function setup_gardenrunc() {
     cp "${GROOTFS_BINARY}" "${GARDEN_BINPATH}/grootfs"
     cp "${GROOTFS_TARDIS_BINARY}" "${GARDEN_BINPATH}/tardis"
     cp "${INIT_BINARY}" "${GARDEN_BINPATH}/init"
+    cp "${GDN_BINARY}" "${GARDEN_BINPATH}/gdn"
   popd
 }
 
@@ -81,7 +82,6 @@ setup_diego_release() {
   pushd ${DIEGO_RELEASE_PATH}
 
   export CODE_CLOUDFOUNDRY_ORG_MODULE="$PWD/src/code.cloudfoundry.org"
-  export GUARDIAN_MODULE="$PWD/src/guardian"
   popd
 }
 
@@ -168,7 +168,7 @@ export REP_GOPATH=${CODE_CLOUDFOUNDRY_ORG_MODULE}
 export ROUTE_EMITTER_GOPATH=${CODE_CLOUDFOUNDRY_ORG_MODULE}
 export SSHD_GOPATH=${CODE_CLOUDFOUNDRY_ORG_MODULE}
 export SSH_PROXY_GOPATH=${CODE_CLOUDFOUNDRY_ORG_MODULE}
-export GARDEN_GOPATH=${GUARDIAN_MODULE}
+export GARDEN_GOPATH=${CODE_CLOUDFOUNDRY_ORG_MODULE}
 
 # used for routing to apps; same logic that Garden uses.
 EXTERNAL_ADDRESS=$(ip route get 8.8.8.8 | sed 's/.*src\s\(.*\)\suid.*/\1/;tx;d;:x')
diff --git a/src/code.cloudfoundry.org/inigo/bin/test.ps1 b/src/code.cloudfoundry.org/inigo/bin/test.ps1
index c5c2375cb5..ff5c22408e 100644
--- a/src/code.cloudfoundry.org/inigo/bin/test.ps1
+++ b/src/code.cloudfoundry.org/inigo/bin/test.ps1
@@ -88,7 +88,6 @@ Setup-DnsNames
 Setup-TempDirContainerAccess
 
 $env:CODE_CLOUDFOUNDRY_ORG_MODULE="$env:DIEGO_RELEASE_PATH/src/code.cloudfoundry.org"
-$env:GUARDIAN_MODULE="$env:DIEGO_RELEASE_PATH/src/guardian"
 $env:ROUTER_GOPATH="$env:ROUTING_RELEASE_PATH\src\code.cloudfoundry.org"
 $env:ROUTING_API_GOPATH=$env:ROUTER_GOPATH
 $env:APP_LIFECYCLE_GOPATH=${env:CODE_CLOUDFOUNDRY_ORG_MODULE}
@@ -101,7 +100,7 @@ $env:REP_GOPATH=${env:CODE_CLOUDFOUNDRY_ORG_MODULE}
 $env:ROUTE_EMITTER_GOPATH=${env:CODE_CLOUDFOUNDRY_ORG_MODULE}
 $env:SSHD_GOPATH=${env:CODE_CLOUDFOUNDRY_ORG_MODULE}
 $env:SSH_PROXY_GOPATH=${env:CODE_CLOUDFOUNDRY_ORG_MODULE}
-$env:GARDEN_GOPATH=${env:GUARDIAN_MODULE}
+$env:GARDEN_GOPATH=${env:CODE_CLOUDFOUNDRY_ORG_MODULE}
 
 # used for routing to apps; same logic that Garden uses.
 $ipAddressObject = Find-NetRoute -RemoteIPAddress "8.8.8.8" | Select-Object IpAddress
diff --git a/src/code.cloudfoundry.org/inigo/cell/cell_suite_test.go b/src/code.cloudfoundry.org/inigo/cell/cell_suite_test.go
index 5190619443..747f56928c 100644
--- a/src/code.cloudfoundry.org/inigo/cell/cell_suite_test.go
+++ b/src/code.cloudfoundry.org/inigo/cell/cell_suite_test.go
@@ -248,12 +248,8 @@ func CompileTestedExecutables() world.BuiltExecutables {
 
 	builtExecutables := world.BuiltExecutables{}
 
-	cwd, err := os.Getwd()
-	Expect(err).NotTo(HaveOccurred())
-	Expect(os.Chdir(os.Getenv("GARDEN_GOPATH"))).To(Succeed())
-	builtExecutables["garden"], err = gexec.Build("./cmd/gdn", "-race", "-a", "-tags", "daemon")
-	Expect(err).NotTo(HaveOccurred())
-	Expect(os.Chdir(cwd)).To(Succeed())
+	builtExecutables["garden"] = os.Getenv("GDN_BINARY")
+	Expect(builtExecutables["garden"]).NotTo(BeEmpty(), "must provide $GDN_BINARY")
 
 	builtExecutables["auctioneer"], err = gexec.Build("code.cloudfoundry.org/auctioneer/cmd/auctioneer", "-race")
 	Expect(err).NotTo(HaveOccurred())
@@ -274,6 +270,8 @@ func CompileTestedExecutables() world.BuiltExecutables {
 	Expect(err).NotTo(HaveOccurred())
 
 	if runtime.GOOS != "windows" {
+		cwd, err := os.Getwd()
+		Expect(err).NotTo(HaveOccurred())
 		Expect(os.Chdir(os.Getenv("ROUTER_GOPATH"))).To(Succeed())
 		builtExecutables["router"], err = gexec.Build("code.cloudfoundry.org/gorouter/cmd/gorouter", "-race")
 		Expect(err).NotTo(HaveOccurred())
diff --git a/src/code.cloudfoundry.org/inigo/executor/executor_suite_test.go b/src/code.cloudfoundry.org/inigo/executor/executor_suite_test.go
index dbbe764284..5b1e113bdf 100644
--- a/src/code.cloudfoundry.org/inigo/executor/executor_suite_test.go
+++ b/src/code.cloudfoundry.org/inigo/executor/executor_suite_test.go
@@ -9,7 +9,6 @@ import (
 	"code.cloudfoundry.org/localip"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/onsi/gomega/gexec"
 	"github.com/tedsuo/ifrit"
 	ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
 
@@ -116,16 +115,10 @@ func TestExecutor(t *testing.T) {
 }
 
 func CompileTestedExecutables() world.BuiltExecutables {
-	var err error
-
 	builtExecutables := world.BuiltExecutables{}
 
-	cwd, err := os.Getwd()
-	Expect(err).NotTo(HaveOccurred())
-	Expect(os.Chdir(os.Getenv("GARDEN_GOPATH"))).To(Succeed())
-	builtExecutables["garden"], err = gexec.Build("./cmd/gdn", "-race", "-a", "-tags", "daemon")
-	Expect(err).NotTo(HaveOccurred())
-	Expect(os.Chdir(cwd)).To(Succeed())
+	builtExecutables["garden"] = os.Getenv("GDN_BINARY")
+	Expect(builtExecutables["garden"]).NotTo(BeEmpty(), "must provide $GDN_BINARY")
 
 	return builtExecutables
 }
diff --git a/src/code.cloudfoundry.org/inigo/volman/volman_suite_test.go b/src/code.cloudfoundry.org/inigo/volman/volman_suite_test.go
index 775555eb26..ae3f8c1e24 100644
--- a/src/code.cloudfoundry.org/inigo/volman/volman_suite_test.go
+++ b/src/code.cloudfoundry.org/inigo/volman/volman_suite_test.go
@@ -219,11 +219,8 @@ func CompileTestedExecutables() world.BuiltExecutables {
 
 	builtExecutables := world.BuiltExecutables{}
 
-	Expect(err).NotTo(HaveOccurred())
-	Expect(os.Chdir(os.Getenv("GARDEN_GOPATH"))).To(Succeed())
-	builtExecutables["garden"], err = gexec.Build("./cmd/gdn", "-race", "-a", "-tags", "daemon")
-	Expect(err).NotTo(HaveOccurred())
-	Expect(os.Chdir(cwd)).To(Succeed())
+	builtExecutables["garden"] = os.Getenv("GDN_BINARY")
+	Expect(builtExecutables["garden"]).NotTo(BeEmpty(), "must provide $GDN_BINARY")
 
 	builtExecutables["local-driver"], err = gexec.Build("code.cloudfoundry.org/localdriver/cmd/localdriver", "-race")
 	Expect(err).NotTo(HaveOccurred())
diff --git a/src/code.cloudfoundry.org/vendor/code.cloudfoundry.org/garden/README.md b/src/code.cloudfoundry.org/vendor/code.cloudfoundry.org/garden/README.md
index a51131995a..95ffee2b51 100644
--- a/src/code.cloudfoundry.org/vendor/code.cloudfoundry.org/garden/README.md
+++ b/src/code.cloudfoundry.org/vendor/code.cloudfoundry.org/garden/README.md
@@ -22,8 +22,7 @@ Reference](https://pkg.go.dev/badge/code.cloudfoundry.org/garden.svg)](https://p
                                                \__._| |_.__/
 
 A rich golang client and server for container creation and management
-with pluggable backends for [The Open Container Initiative
-Spec](https://github.com/cloudfoundry/guardian/).
+with pluggable backends for the Open Container Initiative Spec
 
 > \[!NOTE\]
 >
diff --git a/src/code.cloudfoundry.org/vendor/code.cloudfoundry.org/guardian/rundmc/containerizer.go b/src/code.cloudfoundry.org/vendor/code.cloudfoundry.org/guardian/rundmc/containerizer.go
index 32997c50d7..98b12b34fb 100644
--- a/src/code.cloudfoundry.org/vendor/code.cloudfoundry.org/guardian/rundmc/containerizer.go
+++ b/src/code.cloudfoundry.org/vendor/code.cloudfoundry.org/guardian/rundmc/containerizer.go
@@ -1,4 +1,5 @@
-//lint:file-ignore SA1019 LimitInShares is deprecated but still used until Weight migration completes
+//lint:file-ignore SA1019 - we still specify LimitInShares to make the deprecated logic work until we get rid of the code in garden
+
 package rundmc
 
 import (
diff --git a/src/code.cloudfoundry.org/vendor/modules.txt b/src/code.cloudfoundry.org/vendor/modules.txt
index 395ed9147f..88d2ab55ac 100644
--- a/src/code.cloudfoundry.org/vendor/modules.txt
+++ b/src/code.cloudfoundry.org/vendor/modules.txt
@@ -1,7 +1,7 @@
 # cel.dev/expr v0.25.3
 ## explicit; go 1.23.0
 cel.dev/expr
-# code.cloudfoundry.org/archiver v0.85.0
+# code.cloudfoundry.org/archiver v0.86.0
 ## explicit; go 1.25.0
 code.cloudfoundry.org/archiver/compressor
 code.cloudfoundry.org/archiver/extractor
@@ -85,7 +85,7 @@ code.cloudfoundry.org/credhub-cli/credhub/credentials/generate
 code.cloudfoundry.org/credhub-cli/credhub/credentials/values
 code.cloudfoundry.org/credhub-cli/credhub/permissions
 code.cloudfoundry.org/credhub-cli/credhub/server
-# code.cloudfoundry.org/debugserver v0.112.0
+# code.cloudfoundry.org/debugserver v0.113.0
 ## explicit; go 1.25.0
 code.cloudfoundry.org/debugserver
 # code.cloudfoundry.org/diego-db-helpers v0.12.0
@@ -110,7 +110,7 @@ code.cloudfoundry.org/durationjson
 # code.cloudfoundry.org/eventhub v0.87.0
 ## explicit; go 1.25.0
 code.cloudfoundry.org/eventhub
-# code.cloudfoundry.org/garden v0.0.0-20260826021137-674e52f7c65b => ../garden
+# code.cloudfoundry.org/garden v0.2.0
 ## explicit; go 1.25.0
 code.cloudfoundry.org/garden
 code.cloudfoundry.org/garden/client
@@ -137,7 +137,7 @@ code.cloudfoundry.org/goshims/filepathshim
 code.cloudfoundry.org/goshims/http_wrap
 code.cloudfoundry.org/goshims/osshim
 code.cloudfoundry.org/goshims/osshim/os_fake
-# code.cloudfoundry.org/guardian v0.0.0-20260820194234-c2d9348cfdee => ../guardian
+# code.cloudfoundry.org/guardian v0.0.0-20260902161120-8a4bd5473238
 ## explicit; go 1.26.3
 code.cloudfoundry.org/guardian/gardener
 code.cloudfoundry.org/guardian/gardener/container-spec
@@ -150,14 +150,14 @@ code.cloudfoundry.org/guardian/rundmc/cgroups
 code.cloudfoundry.org/guardian/rundmc/cgroups/fs
 code.cloudfoundry.org/guardian/rundmc/event
 code.cloudfoundry.org/guardian/rundmc/goci
-# code.cloudfoundry.org/lager/v3 v3.84.0
+# code.cloudfoundry.org/lager/v3 v3.85.0
 ## explicit; go 1.25.0
 code.cloudfoundry.org/lager/v3
 code.cloudfoundry.org/lager/v3/internal/truncate
 code.cloudfoundry.org/lager/v3/lagerctx
 code.cloudfoundry.org/lager/v3/lagerflags
 code.cloudfoundry.org/lager/v3/lagertest
-# code.cloudfoundry.org/localip v0.86.0
+# code.cloudfoundry.org/localip v0.87.0
 ## explicit; go 1.25.0
 code.cloudfoundry.org/localip
 # code.cloudfoundry.org/locket v1.10.0
@@ -757,7 +757,7 @@ github.com/google/go-containerregistry/pkg/v1/validate
 github.com/google/go-tpm/legacy/tpm2
 github.com/google/go-tpm/tpmutil
 github.com/google/go-tpm/tpmutil/tbs
-# github.com/google/pprof v0.0.0-20260830191439-4932ad3515ea
+# github.com/google/pprof v0.0.0-20260902005441-ca85771921e4
 ## explicit; go 1.25.0
 github.com/google/pprof/profile
 # github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
@@ -916,6 +916,8 @@ github.com/moby/sys/userns
 ## explicit; go 1.18
 github.com/moby/term
 github.com/moby/term/windows
+# github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee
+## explicit; go 1.12
 # github.com/nats-io/jwt/v2 v2.8.2
 ## explicit; go 1.25.0
 github.com/nats-io/jwt/v2
@@ -1378,9 +1380,5 @@ gorm.io/gorm/logger
 gorm.io/gorm/migrator
 gorm.io/gorm/schema
 gorm.io/gorm/utils
-# code.cloudfoundry.org/garden => ../garden
-# code.cloudfoundry.org/grootfs => ../grootfs
-# code.cloudfoundry.org/guardian => ../guardian
-# code.cloudfoundry.org/idmapper => ../idmapper
 # github.com/cactus/go-statsd-client => github.com/cactus/go-statsd-client v2.0.2-0.20150911070441-6fa055a7b594+incompatible
 # github.com/tedsuo/ifrit => github.com/tedsuo/ifrit v0.0.0-20260418191334-846868129986
diff --git a/src/garden b/src/garden
deleted file mode 160000
index 674e52f7c6..0000000000
--- a/src/garden
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 674e52f7c65b681699fd2472be8ac72a984691b9
diff --git a/src/grootfs b/src/grootfs
deleted file mode 160000
index 3c0907f5a2..0000000000
--- a/src/grootfs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3c0907f5a2ba4bba6276398690e9545e42d6303b
diff --git a/src/guardian b/src/guardian
deleted file mode 160000
index 4b88ababf8..0000000000
--- a/src/guardian
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4b88ababf85c8bc5dc099bee2dc75c833eb80670
diff --git a/src/idmapper b/src/idmapper
deleted file mode 160000
index 2f52d42061..0000000000
--- a/src/idmapper
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2f52d420611cf25a534b9b0034bf33d60285ce42