Upgrade Buildbarn components 2024-12-18 (#158)

buildbarn · Dec 19, 2024 · eae07e9 · eae07e9
1 parent 6695072
commit eae07e9
Show file tree

Hide file tree

Showing 13 changed files with 148 additions and 15,195 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -2,21 +2,21 @@ module(name = "com_github_buildbarn_bb_deployments")
 
 bazel_dep(name = "abseil-cpp", version = "20240116.2")
 bazel_dep(name = "aspect_bazel_lib", version = "2.9.4")
-bazel_dep(name = "aspect_rules_js", version = "2.1.0")
-bazel_dep(name = "bazel_remote_apis", version = "0")
+bazel_dep(name = "aspect_rules_js", version = "2.1.2")
+bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
 bazel_dep(name = "com_github_buildbarn_bb_browser")
 bazel_dep(name = "com_github_buildbarn_bb_remote_execution")
 bazel_dep(name = "com_github_buildbarn_bb_storage")
 bazel_dep(name = "com_github_buildbarn_go_xdr")
 bazel_dep(name = "gazelle", version = "0.40.0")
 bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a")
-bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
+bazel_dep(name = "googletest", version = "1.15.2")
 bazel_dep(name = "jsonnet_go", version = "0.20.0")
-bazel_dep(name = "opentelemetry-proto", version = "1.3.2")
-bazel_dep(name = "protobuf", version = "28.3")
+bazel_dep(name = "opentelemetry-proto", version = "1.4.0")
+bazel_dep(name = "protobuf", version = "29.1")
 bazel_dep(name = "remote_config_cc")
 bazel_dep(name = "rules_antlr")
-bazel_dep(name = "rules_cc", version = "0.0.9")
+bazel_dep(name = "rules_cc", version = "0.0.17")
 bazel_dep(name = "rules_go", version = "0.50.1")
 bazel_dep(name = "rules_jsonnet", version = "0.6.0")
 bazel_dep(name = "rules_oci", version = "2.0.1")
@@ -90,13 +90,13 @@ git_override(
 
 git_override(
     module_name = "com_github_buildbarn_bb_remote_execution",
-    commit = "8a43a7749390a8253a1cf17bae37cc2fe8617dad",
+    commit = "d03d5e3708ed851f7ec73a92e8ba155a97d88793",
     remote = "https://github.com/buildbarn/bb-remote-execution.git",
 )
 
 git_override(
     module_name = "com_github_buildbarn_bb_storage",
-    commit = "9cc3bc2af044eab9a9e11c9f461b0c1e7fc992f2",
+    commit = "078d9d76e0f03cf20480f5e9afa76484f2701a30",
     remote = "https://github.com/buildbarn/bb-storage.git",
 )
 
@@ -160,6 +160,10 @@ go_deps_dev.module_override(
     patches = ["@com_github_buildbarn_bb_storage//:patches/org_golang_x_lint/generic.diff"],
     path = "golang.org/x/lint",
 )
+go_deps_dev.module_override(
+    patches = ["//:patches/org_golang_x_sys/o-search.diff"],
+    path = "golang.org/x/sys",
+)
 go_deps_dev.module_override(
     patches = [
         "@com_github_buildbarn_bb_remote_execution//:patches/com_github_hanwen_go_fuse_v2/direntrylist-offsets-and-testability.diff",
@@ -176,7 +180,7 @@ go_deps_dev.gazelle_override(
     path = "github.com/cncf/xds/go",
 )
 
-cc_configure = use_extension("@bazel_tools//tools/cpp:cc_configure.bzl", "cc_configure_extension")
+cc_configure = use_extension("@rules_cc//cc:extensions.bzl", "cc_configure_extension")
 use_repo(cc_configure, "local_config_cc_toolchains")
 
 register_toolchains("@local_config_cc_toolchains//:all")
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git 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) [`af89e4bc66`](https://github.com/buildbarn/bb-browser/commits/af89e4bc66f01ec022f8473a0068b8b6866662e2)<br/>2023-09-17 04:20:39 UTC | [ghcr.io/buildbarn/bb-browser:20240930T111151Z-af89e4b](https://ghcr.io/buildbarn/bb-browser:20240930T111151Z-af89e4b)<br/>[CI artifacts](https://github.com/buildbarn/bb-browser/actions/runs/11104924905) |
-| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`8a43a77493`](https://github.com/buildbarn/bb-remote-execution/commits/8a43a7749390a8253a1cf17bae37cc2fe8617dad)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20241030T155505Z-8a43a77](https://ghcr.io/buildbarn/bb-runner-installer:20241030T155505Z-8a43a77)<br/>[ghcr.io/buildbarn/bb-scheduler:20241030T155505Z-8a43a77](https://ghcr.io/buildbarn/bb-scheduler:20241030T155505Z-8a43a77)<br/>[ghcr.io/buildbarn/bb-worker:20241030T155505Z-8a43a77](https://ghcr.io/buildbarn/bb-worker:20241030T155505Z-8a43a77)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/11596945646) |
-| [bb-storage](https://github.com/buildbarn/bb-storage) [`9cc3bc2af0`](https://github.com/buildbarn/bb-storage/commits/9cc3bc2af044eab9a9e11c9f461b0c1e7fc992f2)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20241117T113434Z-9cc3bc2](https://ghcr.io/buildbarn/bb-storage:20241117T113434Z-9cc3bc2)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/11878499223) |
+| [bb-remote-execution](https://github.com/buildbarn/bb-remote-execution) [`d03d5e3708`](https://github.com/buildbarn/bb-remote-execution/commits/d03d5e3708ed851f7ec73a92e8ba155a97d88793)<br/>2023-10-04 10:23:25 UTC | [ghcr.io/buildbarn/bb-runner-installer:20241215T094620Z-d03d5e3](https://ghcr.io/buildbarn/bb-runner-installer:20241215T094620Z-d03d5e3)<br/>[ghcr.io/buildbarn/bb-scheduler:20241215T094620Z-d03d5e3](https://ghcr.io/buildbarn/bb-scheduler:20241215T094620Z-d03d5e3)<br/>[ghcr.io/buildbarn/bb-worker:20241215T094620Z-d03d5e3](https://ghcr.io/buildbarn/bb-worker:20241215T094620Z-d03d5e3)<br/>[CI artifacts](https://github.com/buildbarn/bb-remote-execution/actions/runs/12337754540) |
+| [bb-storage](https://github.com/buildbarn/bb-storage) [`078d9d76e0`](https://github.com/buildbarn/bb-storage/commits/078d9d76e0f03cf20480f5e9afa76484f2701a30)<br/>2023-10-08 11:11:12 UTC | [ghcr.io/buildbarn/bb-storage:20241212T082716Z-078d9d7](https://ghcr.io/buildbarn/bb-storage:20241212T082716Z-078d9d7)<br/>[CI artifacts](https://github.com/buildbarn/bb-storage/actions/runs/12292535405) |
 
 ## Changelog
 

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+# 2024-12-18
+
+* Change FUSE mount to not fallback to 'fusermount'
+  https://github.com/buildbarn/bb-remote-execution/commit/d03d5e3708ed851f7ec73a92e8ba155a97d88793
+
 # 2024-11-12
 
 * Double the number of KeyLocationMap attempts

diff --git a/docker-compose/config/worker-fuse-ubuntu22-04.jsonnet b/docker-compose/config/worker-fuse-ubuntu22-04.jsonnet
@@ -60,7 +60,7 @@ local common = import 'common.libsonnet';
           directoryEntryValidity: '300s',
           inodeAttributeValidity: '300s',
           allowOther: true,
-          directMount: true,
+          mountMethod: 'DIRECT',
         },
       },
     },

diff --git 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:20241117T113434Z-9cc3bc2
+    image: ghcr.io/buildbarn/bb-storage:20241212T082716Z-078d9d7
     command:
     - /config/frontend.jsonnet
     expose:
@@ -12,7 +12,7 @@ services:
     - ./config:/config
 
   storage-0:
-    image: ghcr.io/buildbarn/bb-storage:20241117T113434Z-9cc3bc2
+    image: ghcr.io/buildbarn/bb-storage:20241212T082716Z-078d9d7
     command:
     - /config/storage.jsonnet
     expose:
@@ -24,7 +24,7 @@ services:
     - ./volumes/storage-cas-0:/storage-cas
 
   storage-1:
-    image: ghcr.io/buildbarn/bb-storage:20241117T113434Z-9cc3bc2
+    image: ghcr.io/buildbarn/bb-storage:20241212T082716Z-078d9d7
     command:
     - /config/storage.jsonnet
     expose:
@@ -36,7 +36,7 @@ services:
     - ./volumes/storage-cas-1:/storage-cas
 
   scheduler:
-    image: ghcr.io/buildbarn/bb-scheduler:20241030T155505Z-8a43a77
+    image: ghcr.io/buildbarn/bb-scheduler:20241215T094620Z-d03d5e3
     command:
     - /config/scheduler.jsonnet
     expose:
@@ -63,13 +63,13 @@ services:
     - ./config:/config
 
   runner-installer:
-    image: ghcr.io/buildbarn/bb-runner-installer:20241030T155505Z-8a43a77
+    image: ghcr.io/buildbarn/bb-runner-installer:20241215T094620Z-d03d5e3
     volumes:
     - ./volumes/bb:/bb
 
   # The FUSE worker is the most efficient configuration.
   worker-fuse-ubuntu22-04:
-    image: ghcr.io/buildbarn/bb-worker:20241030T155505Z-8a43a77
+    image: ghcr.io/buildbarn/bb-worker:20241215T094620Z-d03d5e3
     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:20241030T155505Z-8a43a77
+    image: ghcr.io/buildbarn/bb-worker:20241215T094620Z-d03d5e3
     command:
     - /config/worker-hardlinking-ubuntu22-04.jsonnet
     privileged: false

diff --git a/go.mod b/go.mod
@@ -5,8 +5,8 @@ go 1.23.0
 // https://github.com/grpc-ecosystem/grpc-gateway/commit/5f9757f31b517d98095209636b2b88cd6326572f
 // replace github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1
 
-// Gazelle does not like newer versions.
-replace golang.org/x/tools => golang.org/x/tools v0.8.0
+// https://github.com/bazel-contrib/rules_go/issues/4170
+replace golang.org/x/tools => golang.org/x/tools v0.26.0
 
 // Using the most recent version causes a cyclic dependency in protoc.
 replace google.golang.org/protobuf => google.golang.org/protobuf v1.32.0
@@ -24,8 +24,8 @@ replace cloud.google.com/go/storage v1.45.0 => cloud.google.com/go/storage v1.43
 require (
 	github.com/bazelbuild/rules_go v0.49.0
 	github.com/buildbarn/bb-browser v0.0.0-20240930111151-af89e4bc66f0
-	github.com/buildbarn/bb-remote-execution v0.0.0-20241030155505-8a43a7749390
-	github.com/buildbarn/bb-storage v0.0.0-20241117113434-9cc3bc2af044
+	github.com/buildbarn/bb-remote-execution v0.0.0-20241215094620-d03d5e3708ed
+	github.com/buildbarn/bb-storage v0.0.0-20241212082716-078d9d76e0f0
 	golang.org/x/lint v0.0.0-20241112194109-818c5a804067
 	mvdan.cc/gofumpt v0.7.0
 )