From 0e1b9bcd168329601c97cc71fa124d1b9c9f7b13 Mon Sep 17 00:00:00 2001 From: Nils Wireklint Date: Wed, 20 Mar 2024 13:20:16 +0100 Subject: [PATCH] Upgrade go dependencies 2024-03-20 --- README.md | 6 +++--- changelog.md | 7 +++++++ docker-compose/docker-compose.yml | 16 ++++++++-------- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- go_dependencies.bzl | 17 ++++++++--------- kubernetes/browser.yaml | 2 +- kubernetes/frontend.yaml | 2 +- kubernetes/scheduler.yaml | 2 +- kubernetes/storage.yaml | 2 +- kubernetes/worker-ubuntu22-04.yaml | 4 ++-- 11 files changed, 44 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index f31d04c..815d319 100644 --- a/README.md +++ b/README.md @@ -34,9 +34,9 @@ at the top right in the GitHub Actions page. | Repository | Container images and binaries | | ---------- | ----------------------------- | -| [bb-browser](https://github.com/buildbarn/bb-browser) [`ab65d55144`](https://github.com/buildbarn/bb-browser/commits/ab65d55144ae43445d3149865ef6e69fd35e3d34)
2023-09-17 04:20:39 UTC | [ghcr.io/buildbarn/bb-browser:20240228T152807Z-ab65d55](https://ghcr.io/buildbarn/bb-browser:20240228T152807Z-ab65d55)
[CI artifacts](https://github.com/buildbarn/bb-browser/actions/runs/8082889844) | -| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`9791c09e5e`](https://github.com/buildbarn/bb-remote-execution/commits/9791c09e5e223bae00477438dd05d1d816835e8c)
2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20240303T174236Z-9791c09](https://ghcr.io/buildbarn/bb-runner-installer:20240303T174236Z-9791c09)
[ghcr.io/buildbarn/bb-scheduler:20240303T174236Z-9791c09](https://ghcr.io/buildbarn/bb-scheduler:20240303T174236Z-9791c09)
[ghcr.io/buildbarn/bb-worker:20240303T174236Z-9791c09](https://ghcr.io/buildbarn/bb-worker:20240303T174236Z-9791c09)
[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/8131961322) | -| [bb-storage](https://github.com/buildbarn/bb-storage) [`0aa40dfdbe`](https://github.com/buildbarn/bb-storage/commits/0aa40dfdbeadc66f8f930e6daad853a452cb1bd8)
2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20240227T100204Z-0aa40df](https://ghcr.io/buildbarn/bb-storage:20240227T100204Z-0aa40df)
[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/8062892865) | +| [bb-browser](https://github.com/buildbarn/bb-browser) [`10b339da63`](https://github.com/buildbarn/bb-browser/commits/10b339da6324b00efb3e8a7cfb95f2f3790bed7f)
2023-09-17 04:20:39 UTC | [ghcr.io/buildbarn/bb-browser:20240310T094611Z-10b339d](https://ghcr.io/buildbarn/bb-browser:20240310T094611Z-10b339d)
[CI artifacts](https://github.com/buildbarn/bb-browser/actions/runs/8222809916) | +| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`28dbdbb0a6`](https://github.com/buildbarn/bb-remote-execution/commits/28dbdbb0a6b077cb7f987393ce537b603da3d045)
2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20240310T090416Z-28dbdbb](https://ghcr.io/buildbarn/bb-runner-installer:20240310T090416Z-28dbdbb)
[ghcr.io/buildbarn/bb-scheduler:20240310T090416Z-28dbdbb](https://ghcr.io/buildbarn/bb-scheduler:20240310T090416Z-28dbdbb)
[ghcr.io/buildbarn/bb-worker:20240310T090416Z-28dbdbb](https://ghcr.io/buildbarn/bb-worker:20240310T090416Z-28dbdbb)
[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/8220869957) | +| [bb-storage](https://github.com/buildbarn/bb-storage) [`4bb23aaa40`](https://github.com/buildbarn/bb-storage/commits/4bb23aaa40ae67adc57ea0b4662f8bfb6d747410)
2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20240320T095126Z-4bb23aa](https://ghcr.io/buildbarn/bb-storage:20240320T095126Z-4bb23aa)
[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/8356874426) | ## Changelog diff --git a/changelog.md b/changelog.md index 85983d7..defe9ec 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,10 @@ +# 2024-03-20 + +* Rewrite Remote Output Service on top of Google's protocol +* Using macOS Sonoma 14.4 or later is recommended for NFSv4.0 +* Remove support for FUSE mounts on macOS + Use NFS instead. + # 2024-02-28 * Integrate kuberesolver into Buildbarn binaries diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 9295405..8342061 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:20240227T100204Z-0aa40df + image: ghcr.io/buildbarn/bb-storage:20240320T095126Z-4bb23aa command: - /config/frontend.jsonnet expose: @@ -12,7 +12,7 @@ services: - ./config:/config storage-0: - image: ghcr.io/buildbarn/bb-storage:20240227T100204Z-0aa40df + image: ghcr.io/buildbarn/bb-storage:20240320T095126Z-4bb23aa command: - /config/storage.jsonnet expose: @@ -24,7 +24,7 @@ services: - ./volumes/storage-cas-0:/storage-cas storage-1: - image: ghcr.io/buildbarn/bb-storage:20240227T100204Z-0aa40df + image: ghcr.io/buildbarn/bb-storage:20240320T095126Z-4bb23aa command: - /config/storage.jsonnet expose: @@ -36,7 +36,7 @@ services: - ./volumes/storage-cas-1:/storage-cas scheduler: - image: ghcr.io/buildbarn/bb-scheduler:20240303T174236Z-9791c09 + image: ghcr.io/buildbarn/bb-scheduler:20240310T090416Z-28dbdbb command: - /config/scheduler.jsonnet expose: @@ -52,7 +52,7 @@ services: - ./config:/config browser: - image: ghcr.io/buildbarn/bb-browser:20240228T152807Z-ab65d55 + image: ghcr.io/buildbarn/bb-browser:20240310T094611Z-10b339d command: - /config/browser.jsonnet expose: @@ -63,13 +63,13 @@ services: - ./config:/config runner-installer: - image: ghcr.io/buildbarn/bb-runner-installer:20240303T174236Z-9791c09 + image: ghcr.io/buildbarn/bb-runner-installer:20240310T090416Z-28dbdbb volumes: - ./volumes/bb:/bb # The FUSE worker is the most efficient configuration. worker-fuse-ubuntu22-04: - image: ghcr.io/buildbarn/bb-worker:20240303T174236Z-9791c09 + image: ghcr.io/buildbarn/bb-worker:20240310T090416Z-28dbdbb command: - /config/worker-fuse-ubuntu22-04.jsonnet # Need to be privileged for the FUSE mounting to work. @@ -105,7 +105,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:20240303T174236Z-9791c09 + image: ghcr.io/buildbarn/bb-worker:20240310T090416Z-28dbdbb command: - /config/worker-hardlinking-ubuntu22-04.jsonnet privileged: false diff --git a/go.mod b/go.mod index 9d03bfa..240e154 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,9 @@ replace golang.org/x/tools => golang.org/x/tools v0.8.0 require ( github.com/bazelbuild/rules_go v0.43.0 - github.com/buildbarn/bb-browser v0.0.0-20240228152807-ab65d55144ae - github.com/buildbarn/bb-remote-execution v0.0.0-20240303174236-9791c09e5e22 - github.com/buildbarn/bb-storage v0.0.0-20240227100204-0aa40dfdbead + github.com/buildbarn/bb-browser v0.0.0-20240310094611-10b339da6324 + github.com/buildbarn/bb-remote-execution v0.0.0-20240310090416-28dbdbb0a6b0 + github.com/buildbarn/bb-storage v0.0.0-20240320095126-4bb23aaa40ae mvdan.cc/gofumpt v0.6.0 ) @@ -101,7 +101,7 @@ require ( golang.org/x/net v0.20.0 // indirect golang.org/x/oauth2 v0.16.0 // indirect golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.17.0 // indirect diff --git a/go.sum b/go.sum index e04a1ac..a11658e 100644 --- a/go.sum +++ b/go.sum @@ -64,12 +64,12 @@ github.com/bazelbuild/rules_go v0.43.0/go.mod h1:TFLfii8e49kTgn329knh1lsJFKdxyp/ github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= 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-20240228152807-ab65d55144ae h1:TFrbPxBWXCwVPIu9oIbmmJPGCjc7X+UfuYIt2As/veM= -github.com/buildbarn/bb-browser v0.0.0-20240228152807-ab65d55144ae/go.mod h1:nn+BHWIXHxO8Mgc4shlEWNJ46s1ayR6ByBTw5GjEHkM= -github.com/buildbarn/bb-remote-execution v0.0.0-20240303174236-9791c09e5e22 h1:ziHMEhNit+rCTGk05+D9PfWbmVfFN+A/NTynkR2Nnm0= -github.com/buildbarn/bb-remote-execution v0.0.0-20240303174236-9791c09e5e22/go.mod h1:qwNvc1PxPWzRzcKiQ/Hq1MQmxB8fjWQ+Lv0h9r8aysU= -github.com/buildbarn/bb-storage v0.0.0-20240227100204-0aa40dfdbead h1:fHapKnQQLgJaMxGiBAUCPVHNfD5vV1LDfXqmyClJ6Lc= -github.com/buildbarn/bb-storage v0.0.0-20240227100204-0aa40dfdbead/go.mod h1:gHT0PInDFOV/JZjeeNwvqmn33MKHHyk3V18e4/Cs/jM= +github.com/buildbarn/bb-browser v0.0.0-20240310094611-10b339da6324 h1:CHnjjCXTIZjs91YjRMlwJv44nckJQOujHNZnWra95vg= +github.com/buildbarn/bb-browser v0.0.0-20240310094611-10b339da6324/go.mod h1:fi1gR5MKF7joIEJwa3sZp6g5QE83Cc3a2paAy2WO7ds= +github.com/buildbarn/bb-remote-execution v0.0.0-20240310090416-28dbdbb0a6b0 h1:wcGel3yU3FAENqRLzgZkg7xzuwlaY9H+Lphd46u5tyI= +github.com/buildbarn/bb-remote-execution v0.0.0-20240310090416-28dbdbb0a6b0/go.mod h1:q3TGK8PD/HoADYpaOU0lup48IOusUuCoP0ilLi+BX7A= +github.com/buildbarn/bb-storage v0.0.0-20240320095126-4bb23aaa40ae h1:e71ZYLQ4QDIVgs/zRX8hNt57d7WomniH2DYZCv8thJ8= +github.com/buildbarn/bb-storage v0.0.0-20240320095126-4bb23aaa40ae/go.mod h1:0uISGKJD6Owt29w2sUlK0TeLtYdLWtBiC43yVHdgMAY= 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= @@ -315,8 +315,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/go_dependencies.bzl b/go_dependencies.bzl index 91b327a..4c21af6 100644 --- a/go_dependencies.bzl +++ b/go_dependencies.bzl @@ -209,20 +209,20 @@ def go_dependencies(): go_repository( name = "com_github_buildbarn_bb_browser", importpath = "github.com/buildbarn/bb-browser", - sum = "h1:TFrbPxBWXCwVPIu9oIbmmJPGCjc7X+UfuYIt2As/veM=", - version = "v0.0.0-20240228152807-ab65d55144ae", + sum = "h1:CHnjjCXTIZjs91YjRMlwJv44nckJQOujHNZnWra95vg=", + version = "v0.0.0-20240310094611-10b339da6324", ) go_repository( name = "com_github_buildbarn_bb_remote_execution", importpath = "github.com/buildbarn/bb-remote-execution", - sum = "h1:ziHMEhNit+rCTGk05+D9PfWbmVfFN+A/NTynkR2Nnm0=", - version = "v0.0.0-20240303174236-9791c09e5e22", + sum = "h1:wcGel3yU3FAENqRLzgZkg7xzuwlaY9H+Lphd46u5tyI=", + version = "v0.0.0-20240310090416-28dbdbb0a6b0", ) go_repository( name = "com_github_buildbarn_bb_storage", importpath = "github.com/buildbarn/bb-storage", - sum = "h1:fHapKnQQLgJaMxGiBAUCPVHNfD5vV1LDfXqmyClJ6Lc=", - version = "v0.0.0-20240227100204-0aa40dfdbead", + sum = "h1:e71ZYLQ4QDIVgs/zRX8hNt57d7WomniH2DYZCv8thJ8=", + version = "v0.0.0-20240320095126-4bb23aaa40ae", ) go_repository( name = "com_github_buildbarn_go_xdr", @@ -1762,9 +1762,8 @@ def go_dependencies(): go_repository( name = "org_golang_x_sys", importpath = "golang.org/x/sys", - patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_x_sys/golang-issue-59357.diff"], - sum = "h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=", - version = "v0.17.0", + sum = "h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=", + version = "v0.18.0", ) go_repository( name = "org_golang_x_term", diff --git a/kubernetes/browser.yaml b/kubernetes/browser.yaml index 647006f..81d4986 100644 --- a/kubernetes/browser.yaml +++ b/kubernetes/browser.yaml @@ -14,7 +14,7 @@ spec: app: browser spec: containers: - - image: ghcr.io/buildbarn/bb-browser:20240228T152807Z-ab65d55 + - image: ghcr.io/buildbarn/bb-browser:20240310T094611Z-10b339d args: - /config/browser.jsonnet name: browser diff --git a/kubernetes/frontend.yaml b/kubernetes/frontend.yaml index 85d2487..9b68e63 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:20240227T100204Z-0aa40df + image: ghcr.io/buildbarn/bb-storage:20240320T095126Z-4bb23aa name: storage ports: - containerPort: 8980 diff --git a/kubernetes/scheduler.yaml b/kubernetes/scheduler.yaml index 82d6244..957981a 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:20240303T174236Z-9791c09 + image: ghcr.io/buildbarn/bb-scheduler:20240310T090416Z-28dbdbb name: scheduler ports: - containerPort: 8982 diff --git a/kubernetes/storage.yaml b/kubernetes/storage.yaml index e2a9da3..09c03f4 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:20240227T100204Z-0aa40df + image: ghcr.io/buildbarn/bb-storage:20240320T095126Z-4bb23aa name: storage ports: - containerPort: 8981 diff --git a/kubernetes/worker-ubuntu22-04.yaml b/kubernetes/worker-ubuntu22-04.yaml index 008aec2..eaab92c 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:20240303T174236Z-9791c09 + image: ghcr.io/buildbarn/bb-worker:20240310T090416Z-28dbdbb name: worker volumeMounts: - mountPath: /config/ @@ -55,7 +55,7 @@ spec: readOnly: true initContainers: - name: bb-runner-installer - image: ghcr.io/buildbarn/bb-runner-installer:20240303T174236Z-9791c09 + image: ghcr.io/buildbarn/bb-runner-installer:20240310T090416Z-28dbdbb volumeMounts: - mountPath: /bb/ name: empty