From f00858911aef0c095483e1a1402c306dd9856bda Mon Sep 17 00:00:00 2001 From: Nils Wireklint Date: Tue, 5 Dec 2023 13:01:19 +0100 Subject: [PATCH] Update Builbarn components 2023-12-05 --- README.md | 6 +++--- changelog.md | 4 ++++ docker-compose/docker-compose.yml | 14 +++++++------- go.mod | 6 +++--- go.sum | 12 ++++++------ go_dependencies.bzl | 12 ++++++------ kubernetes/frontend.yaml | 2 +- kubernetes/scheduler.yaml | 2 +- kubernetes/storage.yaml | 2 +- kubernetes/worker-ubuntu22-04.yaml | 4 ++-- 10 files changed, 34 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 40b09bd..3deb319 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,8 @@ at the top right in the GitHub Actions page. | Repository | Container images and binaries | | ---------- | ----------------------------- | | [bb-browser](https://github.com/buildbarn/bb-browser) [`794e38071d`](https://github.com/buildbarn/bb-browser/commits/794e38071d7a18babfc6c57643767d26415dcd63)
2023-09-17 04:20:39 UTC | [ghcr.io/buildbarn/bb-browser:20231103T134227Z-794e380](https://ghcr.io/buildbarn/bb-browser:20231103T134227Z-794e380)
[CI artifacts](https://github.com/buildbarn/bb-browser/actions/runs/6745964234) | -| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`33a02620cd`](https://github.com/buildbarn/bb-remote-execution/commits/33a02620cd6efedf4963143a930df009f93493b5)
2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20231114T140735Z-33a0262](https://ghcr.io/buildbarn/bb-runner-installer:20231114T140735Z-33a0262)
[ghcr.io/buildbarn/bb-scheduler:20231114T140735Z-33a0262](https://ghcr.io/buildbarn/bb-scheduler:20231114T140735Z-33a0262)
[ghcr.io/buildbarn/bb-worker:20231114T140735Z-33a0262](https://ghcr.io/buildbarn/bb-worker:20231114T140735Z-33a0262)
[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/6864755846) | -| [bb-storage](https://github.com/buildbarn/bb-storage) [`ece87ab6dc`](https://github.com/buildbarn/bb-storage/commits/ece87ab6dc2a9e1e592d2032f5a02c3694765cfc)
2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20231111T202247Z-ece87ab](https://ghcr.io/buildbarn/bb-storage:20231111T202247Z-ece87ab)
[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/6836384126) | +| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`022742f996`](https://github.com/buildbarn/bb-remote-execution/commits/022742f996d61371a9e437eb4479cbef4b62c5a3)
2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20231115T102501Z-022742f](https://ghcr.io/buildbarn/bb-runner-installer:20231115T102501Z-022742f)
[ghcr.io/buildbarn/bb-scheduler:20231115T102501Z-022742f](https://ghcr.io/buildbarn/bb-scheduler:20231115T102501Z-022742f)
[ghcr.io/buildbarn/bb-worker:20231115T102501Z-022742f](https://ghcr.io/buildbarn/bb-worker:20231115T102501Z-022742f)
[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/6876003702) | +| [bb-storage](https://github.com/buildbarn/bb-storage) [`8de3263d2a`](https://github.com/buildbarn/bb-storage/commits/8de3263d2a60e1d266d7da394f26a86ba31b1bea)
2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20231205T110558Z-8de3263](https://ghcr.io/buildbarn/bb-storage:20231205T110558Z-8de3263)
[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/7099832089) | ## Changelog @@ -191,7 +191,7 @@ First make sure the different Buildbarn components are in sync. Then perform: ```bash # Update go.mod. -go mod tidy +go mod tidy -e # Regenerate go_dependencies.bzl. bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro go_dependencies.bzl%go_dependencies -prune diff --git a/changelog.md b/changelog.md index 0e327b8..635bc97 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +# 2023-12-05 + +* ReferenceExpandingBlobAccess: add support for CAS references + # 2023-11-15 * JWT: Enable reading a JSON Web Key set from a file diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index ba9075c..8d867fe 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: frontend: - image: ghcr.io/buildbarn/bb-storage:20231111T202247Z-ece87ab + image: ghcr.io/buildbarn/bb-storage:20231205T110558Z-8de3263 command: - /config/frontend.jsonnet expose: @@ -12,7 +12,7 @@ services: - ./config:/config storage-0: - image: ghcr.io/buildbarn/bb-storage:20231111T202247Z-ece87ab + image: ghcr.io/buildbarn/bb-storage:20231205T110558Z-8de3263 command: - /config/storage.jsonnet expose: @@ -24,7 +24,7 @@ services: - ./volumes/storage-cas-0:/storage-cas storage-1: - image: ghcr.io/buildbarn/bb-storage:20231111T202247Z-ece87ab + image: ghcr.io/buildbarn/bb-storage:20231205T110558Z-8de3263 command: - /config/storage.jsonnet expose: @@ -36,7 +36,7 @@ services: - ./volumes/storage-cas-1:/storage-cas scheduler: - image: ghcr.io/buildbarn/bb-scheduler:20231114T140735Z-33a0262 + image: ghcr.io/buildbarn/bb-scheduler:20231115T102501Z-022742f command: - /config/scheduler.jsonnet expose: @@ -60,13 +60,13 @@ services: - ./config:/config runner-installer: - image: ghcr.io/buildbarn/bb-runner-installer:20231114T140735Z-33a0262 + image: ghcr.io/buildbarn/bb-runner-installer:20231115T102501Z-022742f volumes: - ./volumes/bb:/bb # The FUSE worker is the most efficient configuration. worker-fuse-ubuntu22-04: - image: ghcr.io/buildbarn/bb-worker:20231114T140735Z-33a0262 + image: ghcr.io/buildbarn/bb-worker:20231115T102501Z-022742f command: - /config/worker-fuse-ubuntu22-04.jsonnet # Need to be privileged for the FUSE mounting to work. @@ -102,7 +102,7 @@ services: # For situations where the more efficient FUSE worker is not supported, # the classic hardlinking example is shown here. worker-hardlinking-ubuntu22-04: - image: ghcr.io/buildbarn/bb-worker:20231114T140735Z-33a0262 + image: ghcr.io/buildbarn/bb-worker:20231115T102501Z-022742f command: - /config/worker-hardlinking-ubuntu22-04.jsonnet # Need to be privileged for the FUSE mounting to work. diff --git a/go.mod b/go.mod index 055f5a1..62db2eb 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ replace golang.org/x/tools => golang.org/x/tools v0.8.0 require ( github.com/bazelbuild/rules_go v0.39.1 github.com/buildbarn/bb-browser v0.0.0-20231103134227-794e38071d7a - github.com/buildbarn/bb-remote-execution v0.0.0-20231114140735-33a02620cd6e - github.com/buildbarn/bb-storage v0.0.0-20231111202247-ece87ab6dc2a + github.com/buildbarn/bb-remote-execution v0.0.0-20231115102501-022742f996d6 + github.com/buildbarn/bb-storage v0.0.0-20231205110558-8de3263d2a60 mvdan.cc/gofumpt v0.5.0 ) @@ -46,7 +46,7 @@ require ( github.com/aws/smithy-go v1.16.0 // indirect github.com/bazelbuild/remote-apis v0.0.0-20230822133051-6c32c3b917cc // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/buildbarn/go-xdr v0.0.0-20231002195348-0d2d95eab08c // indirect + github.com/buildbarn/go-xdr v0.0.0-20231115101217-a9e2aa4cf64b // indirect github.com/buildkite/terminal-to-html v3.2.0+incompatible // indirect github.com/campoy/embedmd v1.0.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/go.sum b/go.sum index fd4729f..0a6d1ef 100644 --- a/go.sum +++ b/go.sum @@ -66,12 +66,12 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/buildbarn/bb-browser v0.0.0-20231103134227-794e38071d7a h1:vdHw5gKkeTaTvaOufGlqsjBQNNQuJBa3E4+bStlJhKY= github.com/buildbarn/bb-browser v0.0.0-20231103134227-794e38071d7a/go.mod h1:fcVAYhduv/rnjP5OejRS/KCPKva2jUegcTdvEQqog9s= -github.com/buildbarn/bb-remote-execution v0.0.0-20231114140735-33a02620cd6e h1:XZs2tSEm8fSYr/Wxt7UPtfctOCTBNULstMdxGvPOV4M= -github.com/buildbarn/bb-remote-execution v0.0.0-20231114140735-33a02620cd6e/go.mod h1:6/slYDHJX3eVoiTr8T4nbfhZJwKXZOrcE8W0QJkhKRM= -github.com/buildbarn/bb-storage v0.0.0-20231111202247-ece87ab6dc2a h1:lID82hHXshV67Qj0qCpWiPlJlPAoI/r/4viLuTxKnGc= -github.com/buildbarn/bb-storage v0.0.0-20231111202247-ece87ab6dc2a/go.mod h1:/FlOPiQFmWIyRcHSMAbX9+MX439C8F1pNlHLDAZSGgo= -github.com/buildbarn/go-xdr v0.0.0-20231002195348-0d2d95eab08c h1:lstSRIB5zQnvkSNjzUW8NS5Ox1u/sjL5gksFQ9VQUzo= -github.com/buildbarn/go-xdr v0.0.0-20231002195348-0d2d95eab08c/go.mod h1:VwInghBSUyPtNBhl7o2oCUnxOCTGgySJnRTO1Kh7XuI= +github.com/buildbarn/bb-remote-execution v0.0.0-20231115102501-022742f996d6 h1:6Ah6Yyr0eDDlk0/XP9awgMF2qbTk3Mgz9k9KmBmCIBs= +github.com/buildbarn/bb-remote-execution v0.0.0-20231115102501-022742f996d6/go.mod h1:L7pq3XpcUalf29DaeArpX1h7u11no2TxIJUuhupirJk= +github.com/buildbarn/bb-storage v0.0.0-20231205110558-8de3263d2a60 h1:OkdOv+8YyAuDisWdKtWnx+qpw+/rrtGRad1YvKiDZTk= +github.com/buildbarn/bb-storage v0.0.0-20231205110558-8de3263d2a60/go.mod h1:/FlOPiQFmWIyRcHSMAbX9+MX439C8F1pNlHLDAZSGgo= +github.com/buildbarn/go-xdr v0.0.0-20231115101217-a9e2aa4cf64b h1:/sKWC0Fs5fXNo/t72BRZRLERg4v2gFoEeg2Mk+a8xak= +github.com/buildbarn/go-xdr v0.0.0-20231115101217-a9e2aa4cf64b/go.mod h1:VwInghBSUyPtNBhl7o2oCUnxOCTGgySJnRTO1Kh7XuI= github.com/buildkite/terminal-to-html v3.2.0+incompatible h1:WdXzl7ZmYzCAz4pElZosPaUlRTW+qwVx/SkQSCa1jXs= github.com/buildkite/terminal-to-html v3.2.0+incompatible/go.mod h1:BFFdFecOxCgjdcarqI+8izs6v85CU/1RA/4Bqh4GR7E= github.com/campoy/embedmd v1.0.0 h1:V4kI2qTJJLf4J29RzI/MAt2c3Bl4dQSYPuflzwFH2hY= diff --git a/go_dependencies.bzl b/go_dependencies.bzl index b27286e..db18a2f 100644 --- a/go_dependencies.bzl +++ b/go_dependencies.bzl @@ -215,20 +215,20 @@ def go_dependencies(): go_repository( name = "com_github_buildbarn_bb_remote_execution", importpath = "github.com/buildbarn/bb-remote-execution", - sum = "h1:XZs2tSEm8fSYr/Wxt7UPtfctOCTBNULstMdxGvPOV4M=", - version = "v0.0.0-20231114140735-33a02620cd6e", + sum = "h1:6Ah6Yyr0eDDlk0/XP9awgMF2qbTk3Mgz9k9KmBmCIBs=", + version = "v0.0.0-20231115102501-022742f996d6", ) go_repository( name = "com_github_buildbarn_bb_storage", importpath = "github.com/buildbarn/bb-storage", - sum = "h1:lID82hHXshV67Qj0qCpWiPlJlPAoI/r/4viLuTxKnGc=", - version = "v0.0.0-20231111202247-ece87ab6dc2a", + sum = "h1:OkdOv+8YyAuDisWdKtWnx+qpw+/rrtGRad1YvKiDZTk=", + version = "v0.0.0-20231205110558-8de3263d2a60", ) go_repository( name = "com_github_buildbarn_go_xdr", importpath = "github.com/buildbarn/go-xdr", - sum = "h1:lstSRIB5zQnvkSNjzUW8NS5Ox1u/sjL5gksFQ9VQUzo=", - version = "v0.0.0-20231002195348-0d2d95eab08c", + sum = "h1:/sKWC0Fs5fXNo/t72BRZRLERg4v2gFoEeg2Mk+a8xak=", + version = "v0.0.0-20231115101217-a9e2aa4cf64b", ) go_repository( name = "com_github_buildkite_terminal_to_html", diff --git a/kubernetes/frontend.yaml b/kubernetes/frontend.yaml index 13a14a6..2bc2c8d 100644 --- a/kubernetes/frontend.yaml +++ b/kubernetes/frontend.yaml @@ -16,7 +16,7 @@ spec: containers: - args: - /config/frontend.jsonnet - image: ghcr.io/buildbarn/bb-storage:20231111T202247Z-ece87ab + image: ghcr.io/buildbarn/bb-storage:20231205T110558Z-8de3263 name: storage ports: - containerPort: 8980 diff --git a/kubernetes/scheduler.yaml b/kubernetes/scheduler.yaml index 52815a5..eeb4c5e 100644 --- a/kubernetes/scheduler.yaml +++ b/kubernetes/scheduler.yaml @@ -18,7 +18,7 @@ spec: containers: - args: - /config/scheduler.jsonnet - image: ghcr.io/buildbarn/bb-scheduler:20231114T140735Z-33a0262 + image: ghcr.io/buildbarn/bb-scheduler:20231115T102501Z-022742f name: scheduler ports: - containerPort: 8982 diff --git a/kubernetes/storage.yaml b/kubernetes/storage.yaml index 9df9427..146dd0f 100644 --- a/kubernetes/storage.yaml +++ b/kubernetes/storage.yaml @@ -17,7 +17,7 @@ spec: containers: - args: - /config/storage.jsonnet - image: ghcr.io/buildbarn/bb-storage:20231111T202247Z-ece87ab + image: ghcr.io/buildbarn/bb-storage:20231205T110558Z-8de3263 name: storage ports: - containerPort: 8981 diff --git a/kubernetes/worker-ubuntu22-04.yaml b/kubernetes/worker-ubuntu22-04.yaml index 338f534..a15144b 100644 --- a/kubernetes/worker-ubuntu22-04.yaml +++ b/kubernetes/worker-ubuntu22-04.yaml @@ -21,7 +21,7 @@ spec: containers: - args: - /config/worker-ubuntu22-04.jsonnet - image: ghcr.io/buildbarn/bb-worker:20231114T140735Z-33a0262 + image: ghcr.io/buildbarn/bb-worker:20231115T102501Z-022742f name: worker volumeMounts: - mountPath: /config/ @@ -55,7 +55,7 @@ spec: readOnly: true initContainers: - name: bb-runner-installer - image: ghcr.io/buildbarn/bb-runner-installer:20231114T140735Z-33a0262 + image: ghcr.io/buildbarn/bb-runner-installer:20231115T102501Z-022742f volumeMounts: - mountPath: /bb/ name: bb-runner