Skip to content

Commit dcfd162

Browse files
authored
Upgrade images to rendezvous hashing config (#167)
1 parent a26c16b commit dcfd162

File tree

14 files changed

+292
-564
lines changed

14 files changed

+292
-564
lines changed

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,19 +111,19 @@ git_override(
111111

112112
git_override(
113113
module_name = "com_github_buildbarn_bb_browser",
114-
commit = "9c1714be8cf55061c698b2e629e13496071e23a1",
114+
commit = "9b44996f7d6a04185f61e7752cbe8649aaa59f16",
115115
remote = "https://github.com/buildbarn/bb-browser.git",
116116
)
117117

118118
git_override(
119119
module_name = "com_github_buildbarn_bb_remote_execution",
120-
commit = "31d23d1a2b0cf4c6785bc96e3576e439063d6b7c",
120+
commit = "1c726bdc27e7793c685d8788913f8f91f59bc887",
121121
remote = "https://github.com/buildbarn/bb-remote-execution.git",
122122
)
123123

124124
git_override(
125125
module_name = "com_github_buildbarn_bb_storage",
126-
commit = "2600f229e4b68a92591109827f78b047a7fe4d01",
126+
commit = "1d733a37487a01416bda38eff6f61eb78103c7f0",
127127
remote = "https://github.com/buildbarn/bb-storage.git",
128128
)
129129

MODULE.bazel.lock

Lines changed: 17 additions & 245 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ at the top right in the GitHub Actions page.
3434

3535
| Repository | Container images and binaries |
3636
| ---------- | ----------------------------- |
37-
| [bb-browser](https://github.com/buildbarn/bb-browser) [`9c1714be8c`](https://github.com/buildbarn/bb-browser/commits/9c1714be8cf55061c698b2e629e13496071e23a1)<br/>2023-09-17 04:20:39 UTC | [ghcr.io/buildbarn/bb-browser:20250212T055122Z-9c1714b](https://ghcr.io/buildbarn/bb-browser:20250212T055122Z-9c1714b)<br/>[CI artifacts](https://github.com/buildbarn/bb-browser/actions/runs/13278991952) |
38-
| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`31d23d1a2b`](https://github.com/buildbarn/bb-remote-execution/commits/31d23d1a2b0cf4c6785bc96e3576e439063d6b7c)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20250201T092335Z-31d23d1](https://ghcr.io/buildbarn/bb-runner-installer:20250201T092335Z-31d23d1)<br/>[ghcr.io/buildbarn/bb-scheduler:20250201T092335Z-31d23d1](https://ghcr.io/buildbarn/bb-scheduler:20250201T092335Z-31d23d1)<br/>[ghcr.io/buildbarn/bb-worker:20250201T092335Z-31d23d1](https://ghcr.io/buildbarn/bb-worker:20250201T092335Z-31d23d1)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/13087286762) |
39-
| [bb-storage](https://github.com/buildbarn/bb-storage) [`2600f229e4`](https://github.com/buildbarn/bb-storage/commits/2600f229e4b68a92591109827f78b047a7fe4d01)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20250213T085125Z-2600f22](https://ghcr.io/buildbarn/bb-storage:20250213T085125Z-2600f22)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/13303866642) |
37+
| [bb-browser](https://github.com/buildbarn/bb-browser) [`9b44996f7d`](https://github.com/buildbarn/bb-browser/commits/9b44996f7d6a04185f61e7752cbe8649aaa59f16)<br/>2023-09-17 04:20:39 UTC | [ghcr.io/buildbarn/bb-browser:20250414T180739Z-9b44996](https://ghcr.io/buildbarn/bb-browser:20250414T180739Z-9b44996)<br/>[CI artifacts](https://github.com/buildbarn/bb-browser/actions/runs/14452582814) |
38+
| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`1c726bdc27`](https://github.com/buildbarn/bb-remote-execution/commits/1c726bdc27e7793c685d8788913f8f91f59bc887)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20250411T124310Z-1c726bd](https://ghcr.io/buildbarn/bb-runner-installer:20250411T124310Z-1c726bd)<br/>[ghcr.io/buildbarn/bb-scheduler:20250411T124310Z-1c726bd](https://ghcr.io/buildbarn/bb-scheduler:20250411T124310Z-1c726bd)<br/>[ghcr.io/buildbarn/bb-worker:20250411T124310Z-1c726bd](https://ghcr.io/buildbarn/bb-worker:20250411T124310Z-1c726bd)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/14403397088) |
39+
| [bb-storage](https://github.com/buildbarn/bb-storage) [`1d733a3748`](https://github.com/buildbarn/bb-storage/commits/1d733a37487a01416bda38eff6f61eb78103c7f0)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20250408T112116Z-1d733a3](https://ghcr.io/buildbarn/bb-storage:20250408T112116Z-1d733a3)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/14332223689) |
4040

4141
## Changelog
4242

@@ -194,19 +194,12 @@ First make sure the different Buildbarn components are in sync. Then perform:
194194
# Update go.mod.
195195
go mod tidy -e
196196

197-
# Regenerate go_dependencies.bzl.
198-
bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro go_dependencies.bzl%go_dependencies -prune
199-
# Format go_dependencies.bzl according to GitHub Actions.
200-
sed -i '/^$/d' go_dependencies.bzl
201197
bazelisk run //:buildifier.check
202198

203199
# Update the Kubernetes and Docker compose deployments.
204200
./tools/update-container-image-versions.sh
205201
```
206202

207-
You might have to update the `WORKSPACE` file as well,
208-
until `MODULE.bazel` is in place.
209-
210203
## Formatting
211204

212205
A number of linting and formatting steps are performed in the GitHub Actions flow.
@@ -217,8 +210,6 @@ Some of the steps are:
217210
bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro go_dependencies.bzl%go_dependencies -prune
218211
bazel run //:gazelle
219212
# Buildifier
220-
sed '/^$/d' go_dependencies.bzl > go_dependencies.bzl.new
221-
mv go_dependencies.bzl.new go_dependencies.bzl
222213
bazel run //:buildifier.check
223214
# Gofmt
224215
bazel run @cc_mvdan_gofumpt//:gofumpt -- -w -extra $PWD

docker-compose/config/common.libsonnet

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,32 @@
22
blobstore: {
33
contentAddressableStorage: {
44
sharding: {
5-
hashInitialization: 11946695773637837490,
6-
shards: [
7-
{
5+
shards: {
6+
"0": {
87
backend: { grpc: { address: 'storage-0:8981' } },
98
weight: 1,
109
},
11-
{
10+
"1": {
1211
backend: { grpc: { address: 'storage-1:8981' } },
1312
weight: 1,
1413
},
15-
],
14+
},
1615
},
1716
},
1817
actionCache: {
1918
completenessChecking: {
2019
backend: {
2120
sharding: {
22-
hashInitialization: 14897363947481274433,
23-
shards: [
24-
{
21+
shards: {
22+
"0": {
2523
backend: { grpc: { address: 'storage-0:8981' } },
2624
weight: 1,
2725
},
28-
{
26+
"1": {
2927
backend: { grpc: { address: 'storage-1:8981' } },
3028
weight: 1,
3129
},
32-
],
30+
},
3331
},
3432
},
3533
maximumTotalTreeSizeBytes: 64 * 1024 * 1024,

docker-compose/docker-compose.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3'
22
services:
33
frontend:
4-
image: ghcr.io/buildbarn/bb-storage:20250213T085125Z-2600f22
4+
image: ghcr.io/buildbarn/bb-storage:20250408T112116Z-1d733a3
55
command:
66
- /config/frontend.jsonnet
77
expose:
@@ -12,7 +12,7 @@ services:
1212
- ./config:/config
1313

1414
storage-0:
15-
image: ghcr.io/buildbarn/bb-storage:20250213T085125Z-2600f22
15+
image: ghcr.io/buildbarn/bb-storage:20250408T112116Z-1d733a3
1616
command:
1717
- /config/storage.jsonnet
1818
expose:
@@ -24,7 +24,7 @@ services:
2424
- ./volumes/storage-cas-0:/storage-cas
2525

2626
storage-1:
27-
image: ghcr.io/buildbarn/bb-storage:20250213T085125Z-2600f22
27+
image: ghcr.io/buildbarn/bb-storage:20250408T112116Z-1d733a3
2828
command:
2929
- /config/storage.jsonnet
3030
expose:
@@ -36,7 +36,7 @@ services:
3636
- ./volumes/storage-cas-1:/storage-cas
3737

3838
scheduler:
39-
image: ghcr.io/buildbarn/bb-scheduler:20250201T092335Z-31d23d1
39+
image: ghcr.io/buildbarn/bb-scheduler:20250411T124310Z-1c726bd
4040
command:
4141
- /config/scheduler.jsonnet
4242
expose:
@@ -52,7 +52,7 @@ services:
5252
- ./config:/config
5353

5454
browser:
55-
image: ghcr.io/buildbarn/bb-browser:20250212T055122Z-9c1714b
55+
image: ghcr.io/buildbarn/bb-browser:20250414T180739Z-9b44996
5656
command:
5757
- /config/browser.jsonnet
5858
expose:
@@ -63,13 +63,13 @@ services:
6363
- ./config:/config
6464

6565
runner-installer:
66-
image: ghcr.io/buildbarn/bb-runner-installer:20250201T092335Z-31d23d1
66+
image: ghcr.io/buildbarn/bb-runner-installer:20250411T124310Z-1c726bd
6767
volumes:
6868
- ./volumes/bb:/bb
6969

7070
# The FUSE worker is the most efficient configuration.
7171
worker-fuse-ubuntu22-04:
72-
image: ghcr.io/buildbarn/bb-worker:20250201T092335Z-31d23d1
72+
image: ghcr.io/buildbarn/bb-worker:20250411T124310Z-1c726bd
7373
command:
7474
- /config/worker-fuse-ubuntu22-04.jsonnet
7575
# Need to be privileged for the FUSE mounting to work.
@@ -105,7 +105,7 @@ services:
105105
# For situations where the more efficient FUSE worker is not supported,
106106
# the classic hardlinking example is shown here.
107107
worker-hardlinking-ubuntu22-04:
108-
image: ghcr.io/buildbarn/bb-worker:20250201T092335Z-31d23d1
108+
image: ghcr.io/buildbarn/bb-worker:20250411T124310Z-1c726bd
109109
command:
110110
- /config/worker-hardlinking-ubuntu22-04.jsonnet
111111
privileged: false

0 commit comments

Comments
 (0)