Skip to content

Remove garden-runc submodules #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
winkingturtle-vmw wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Remove garden-runc submodules #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,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/garden"]
path = src/garden
url = https://github.com/cloudfoundry/garden
[submodule "src/guardian"]
path = src/guardian
url = https://github.com/cloudfoundry/guardian
[submodule "src/grootfs"]
path = src/grootfs
url = https://github.com/cloudfoundry/grootfs
[submodule "src/idmapper"]
path = src/idmapper
url = https://github.com/cloudfoundry/idmapper
16 changes: 7 additions & 9 deletions src/code.cloudfoundry.org/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@ module code.cloudfoundry.org
go 1.26.5

replace (
code.cloudfoundry.org/garden => ../garden
code.cloudfoundry.org/grootfs => ../grootfs
code.cloudfoundry.org/guardian => ../guardian
code.cloudfoundry.org/idmapper => ../idmapper
code.cloudfoundry.org/guardian => github.com/cloudfoundry/guardian v0.0.0-20260731120748-50a535ff5c03
github.com/cactus/go-statsd-client => github.com/cactus/go-statsd-client v2.0.2-0.20150911070441-6fa055a7b594+incompatible
github.com/cilium/ebpf => github.com/cilium/ebpf v0.17.3
)

require (
code.cloudfoundry.org/archiver v0.80.0
code.cloudfoundry.org/archiver v0.81.0
code.cloudfoundry.org/bbs v1.11.0
code.cloudfoundry.org/bbs/encryption v1.9.0
code.cloudfoundry.org/bbs/format v1.9.0
Expand All @@ -27,11 +25,11 @@ require (
code.cloudfoundry.org/dockerdriver v0.99.0
code.cloudfoundry.org/durationjson v0.82.0
code.cloudfoundry.org/eventhub v0.82.0
code.cloudfoundry.org/garden v0.0.0-20260722020902-0d62a2590a0f
code.cloudfoundry.org/garden v0.0.0-20260729020900-a0441c36f7b5
code.cloudfoundry.org/go-loggregator/v9 v9.2.1
code.cloudfoundry.org/goshims v0.107.0
code.cloudfoundry.org/guardian v0.0.0-20260722021324-599e660ac834
code.cloudfoundry.org/lager/v3 v3.79.0
code.cloudfoundry.org/lager/v3 v3.80.0
code.cloudfoundry.org/localip v0.82.0
code.cloudfoundry.org/locket v1.5.0
code.cloudfoundry.org/routing-api v0.7.0
Expand Down Expand Up @@ -80,7 +78,7 @@ require (
golang.org/x/oauth2 v0.36.0
golang.org/x/sys v0.47.0
golang.org/x/time v0.15.0
google.golang.org/grpc v1.82.1
google.golang.org/grpc v1.83.0
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
Expand Down Expand Up @@ -222,7 +220,7 @@ require (
golang.org/x/text v0.40.0 // indirect
golang.org/x/tools v0.48.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260727163830-6c54dddc4772 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260727163830-6c54dddc4772 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260729162451-8efbd57d26e0 // indirect
gorm.io/driver/mysql v1.6.0 // indirect
gorm.io/driver/postgres v1.6.0 // indirect
gorm.io/gorm v1.31.2 // indirect
Expand Down
20 changes: 12 additions & 8 deletions src/code.cloudfoundry.org/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.80.0 h1:QghPcLMZKk3KATnfBQcjlXoFemAZPcl897WdifBx4mU=
code.cloudfoundry.org/archiver v0.80.0/go.mod h1:teFJOAko+bWVrZClYPoqTEFxF/8Pn7r6U8DWHAD6qRs=
code.cloudfoundry.org/archiver v0.81.0 h1:rgKXuUH0mwlB8yep+qNIKqjcoKbevWY0G8O2ToNPRuk=
code.cloudfoundry.org/archiver v0.81.0/go.mod h1:j0ICCxoNIpveqUrxceaMWBhi3yRGxFhFVlFafWMjBfE=
code.cloudfoundry.org/bbs v1.11.0 h1:w8Q+ORAmTW+nmHwWROrfCqtM5U2p7rOfmIDNqWJLQKM=
code.cloudfoundry.org/bbs v1.11.0/go.mod h1:AZp+BWN9K/9A5KiQ7KT+F5V8nWDkBFN4ieGAg40OFXI=
code.cloudfoundry.org/bbs/encryption v1.9.0 h1:1IiWKO4nqJonCi0JeoIVobPsTE8FRhbB9Fq1MRTikEA=
Expand Down Expand Up @@ -630,14 +630,16 @@ code.cloudfoundry.org/durationjson v0.82.0 h1:Mk6NQUxM7voITbJzy9vqooCP+R6slZ/P3T
code.cloudfoundry.org/durationjson v0.82.0/go.mod h1:2ta2CwA+djptmVLDiMk0euVr2szlz35e68mfkvhJMdw=
code.cloudfoundry.org/eventhub v0.82.0 h1:nRyUCUzUiQZHGdrZcT5jqSjUUC1Vz11zAbZpV6W2h/Y=
code.cloudfoundry.org/eventhub v0.82.0/go.mod h1:yT3TSOxgQCHAnkezTEvlsermZY2QIj6upmkRzzYxKvE=
code.cloudfoundry.org/garden v0.0.0-20260729020900-a0441c36f7b5 h1:XkYjJPCMKYr7sg2N+AoTmI0ydyoGGGF5H5HeNLfrWhw=
code.cloudfoundry.org/garden v0.0.0-20260729020900-a0441c36f7b5/go.mod h1:G6RXuzjLFtbH+so/mHseQwDG6LQEaR75GAGlzzrRjQo=
code.cloudfoundry.org/go-diodes v0.0.0-20260720065427-59f65622c841 h1:zvumGkVYJgjVJZo/BCcc2HSMVO2BLvrX0wCg+KLvT20=
code.cloudfoundry.org/go-diodes v0.0.0-20260720065427-59f65622c841/go.mod h1:czNfbIZFq2IWuL5+OYO/zlEzOL3rbWPfOVIuymG9la4=
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.107.0 h1:inbML8AaLXVELnqbrOXDuYkM66duK8qb1vQg/IFis44=
code.cloudfoundry.org/goshims v0.107.0/go.mod h1:uICsJV2LXpBvmAgjoaNm3T+EixSJwD80Ng8MtD30Nto=
code.cloudfoundry.org/lager/v3 v3.79.0 h1:smCMi1gjwx41bYoP5Czgi+wzEecC58rS6HKDxBMWM9g=
code.cloudfoundry.org/lager/v3 v3.79.0/go.mod h1:7ugnISYee5tuV8vCot1Gn+oIhssl4KErf5TlPwtU7qk=
code.cloudfoundry.org/lager/v3 v3.80.0 h1:TYFCcCQ2lG+kEN+3NJiUvXRhWTsW5Ju14xmV429YaT0=
code.cloudfoundry.org/lager/v3 v3.80.0/go.mod h1:08ujODr8WeHIekdvjPTMDGTXpbc5lpbPpFbkOTJw6v8=
code.cloudfoundry.org/localip v0.82.0 h1:ZAJAB4R1v1wUAqaoDHNERi6e7gFKmWMdAvbj3PYJfl4=
code.cloudfoundry.org/localip v0.82.0/go.mod h1:bj+jelfPgqSusGYmOcQSXp+O1JUdr/n8Fkm7GN4JkOs=
code.cloudfoundry.org/locket v1.5.0 h1:KM443ZrNUTmPn/xjsNvsG13eCult//etG48FxLYyDcY=
Expand Down Expand Up @@ -802,6 +804,8 @@ github.com/cloudfoundry/dropsonde v1.1.0 h1:nerhj8K0heOsv/U/Ddou5Esw56YlNeHHJH6M
github.com/cloudfoundry/dropsonde v1.1.0/go.mod h1:OrkxsBrAvM8X0Ve9vaSNKLR+/Jeohu3+J0M4JEaTmnM=
github.com/cloudfoundry/go-socks5 v0.0.0-20250423223041-4ad5fea42851 h1:oy59UYcspoP44ggE8DM3kjxl1+sTFd802bbZlBBhBMk=
github.com/cloudfoundry/go-socks5 v0.0.0-20250423223041-4ad5fea42851/go.mod h1:72EEm1oq5oXqGfu9XGtaRPWEcAFYd/P10cMNln0QhA8=
github.com/cloudfoundry/guardian v0.0.0-20260731120748-50a535ff5c03 h1:lh+M/xiuPAjo9rpG1VW85S9JM0wxxSZcIZliRodciUA=
github.com/cloudfoundry/guardian v0.0.0-20260731120748-50a535ff5c03/go.mod h1:EPDWErc/hL71FwVrGq5ukQhBhjohyiA4mSIdenbIfv0=
github.com/cloudfoundry/socks5-proxy v0.2.183 h1:QgkOB5Od0pzRtyZPQotD6USsxuo13GyhmrAiA0nzjkg=
github.com/cloudfoundry/socks5-proxy v0.2.183/go.mod h1:tnJUhAsMqnBPAt+p+SsNsaAo4lrqxYlpDHD+uURZX4s=
github.com/cloudfoundry/sonde-go v0.0.0-20260720065356-6728909ed72b h1:QoG349bugPqkb8XqPgZbf6VWyAuh3ONbTJ5aKazvbeQ=
Expand Down Expand Up @@ -2108,8 +2112,8 @@ google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOl
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
google.golang.org/genproto/googleapis/api v0.0.0-20260727163830-6c54dddc4772 h1:4namukbyF7JY83aWHQwi9J5ugNTnDReLJ9ZcpqOpRB4=
google.golang.org/genproto/googleapis/api v0.0.0-20260727163830-6c54dddc4772/go.mod h1:1brfde68Npq6+WA75c1EHWPijZEG1kMus61ygPZfn4A=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260727163830-6c54dddc4772 h1:zuslGE3FGxH0hC6veLvSLME3TZzun9MQzjYwo1CBN+k=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260727163830-6c54dddc4772/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260729162451-8efbd57d26e0 h1:mJiOtnGp0k/BcSgdu03G2NwnscCfCH+h2QKUBZr18KI=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260729162451-8efbd57d26e0/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
Expand Down Expand Up @@ -2152,8 +2156,8 @@ google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5v
google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
google.golang.org/grpc v1.82.1 h1:NnAxzGRA0677vCa4BUkOAnO5+FfQqVl9iUXeD0IqcGE=
google.golang.org/grpc v1.82.1/go.mod h1:yzTZ1TB1Z3SG+LIYaI+WiE8D5+PZ3ArnrSp8zF3+/ZA=
google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ=
google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/grpc/examples v0.0.0-20230512210959-5dcfb37c0b43/go.mod h1:irORyHPQXotoshbRTZVFvPDcfTfFHL23efQeop+H45M=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
Expand Down
3 changes: 1 addition & 2 deletions src/code.cloudfoundry.org/inigo/bin/test.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,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
}

Expand Down Expand Up @@ -168,7 +167,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')
Expand Down
3 changes: 1 addition & 2 deletions src/code.cloudfoundry.org/inigo/bin/test.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
Expand Down
8 changes: 3 additions & 5 deletions src/code.cloudfoundry.org/inigo/cell/cell_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,8 @@ func CompileTestedExecutables() world.BuiltExecutables {

builtExecutables := world.BuiltExecutables{}

cwd, err := os.Getwd()
builtExecutables["garden"], err = gexec.Build("code.cloudfoundry.org/guardian/cmd/gdn", "-race", "-a", "-tags", "daemon")
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["auctioneer"], err = gexec.Build("code.cloudfoundry.org/auctioneer/cmd/auctioneer", "-race")
Expect(err).NotTo(HaveOccurred())
Expand All @@ -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())
Expand Down
6 changes: 1 addition & 5 deletions src/code.cloudfoundry.org/inigo/executor/executor_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,8 @@ func CompileTestedExecutables() world.BuiltExecutables {

builtExecutables := world.BuiltExecutables{}

cwd, err := os.Getwd()
builtExecutables["garden"], err = gexec.Build("code.cloudfoundry.org/guardian/cmd/gdn", "-race", "-a", "-tags", "daemon")
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())

return builtExecutables
}
5 changes: 1 addition & 4 deletions src/code.cloudfoundry.org/inigo/volman/volman_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,8 @@ func CompileTestedExecutables() world.BuiltExecutables {

builtExecutables := world.BuiltExecutables{}

builtExecutables["garden"], err = gexec.Build("code.cloudfoundry.org/guardian/cmd/gdn", "-race", "-a", "-tags", "daemon")
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["local-driver"], err = gexec.Build("code.cloudfoundry.org/localdriver/cmd/localdriver", "-race")
Expect(err).NotTo(HaveOccurred())
Expand Down
1 change: 1 addition & 0 deletions src/code.cloudfoundry.org/vendor/code.cloudfoundry.org/guardian/rundmc/containerizer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 4 additions & 19 deletions src/code.cloudfoundry.org/vendor/google.golang.org/grpc/clientconn.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 48 additions & 0 deletions ...de.cloudfoundry.org/vendor/google.golang.org/grpc/clientconn_disconnect_reason_noplan9.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 39 additions & 0 deletions ...code.cloudfoundry.org/vendor/google.golang.org/grpc/clientconn_disconnect_reason_plan9.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions src/code.cloudfoundry.org/vendor/google.golang.org/grpc/internal/envconfig/xds.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading