chore(docker): upgrade images to new config

Author: tyler-french

MODULE.bazel

@@ -111,19 +111,19 @@ git_override(
 
 git_override(
     module_name = "com_github_buildbarn_bb_browser",
-    commit = "9c1714be8cf55061c698b2e629e13496071e23a1",
+    commit = "9b44996f7d6a04185f61e7752cbe8649aaa59f16",
     remote = "https://github.com/buildbarn/bb-browser.git",
 )
 
 git_override(
     module_name = "com_github_buildbarn_bb_remote_execution",
-    commit = "31d23d1a2b0cf4c6785bc96e3576e439063d6b7c",
+    commit = "1c726bdc27e7793c685d8788913f8f91f59bc887",
     remote = "https://github.com/buildbarn/bb-remote-execution.git",
 )
 
 git_override(
     module_name = "com_github_buildbarn_bb_storage",
-    commit = "2600f229e4b68a92591109827f78b047a7fe4d01",
+    commit = "1d733a37487a01416bda38eff6f61eb78103c7f0",
     remote = "https://github.com/buildbarn/bb-storage.git",
 )
 

docker-compose/config/common.libsonnet

@@ -2,34 +2,32 @@
   blobstore: {
     contentAddressableStorage: {
       sharding: {
-        hashInitialization: 11946695773637837490,
-        shards: [
-          {
+        shards: {
+          "0": {
             backend: { grpc: { address: 'storage-0:8981' } },
             weight: 1,
           },
-          {
+          "1": {
             backend: { grpc: { address: 'storage-1:8981' } },
             weight: 1,
           },
-        ],
+        },
       },
     },
     actionCache: {
       completenessChecking: {
         backend: {
           sharding: {
-            hashInitialization: 14897363947481274433,
-            shards: [
-              {
+            shards: {
+              "0": {
                 backend: { grpc: { address: 'storage-0:8981' } },
                 weight: 1,
               },
-              {
+              "1": {
                 backend: { grpc: { address: 'storage-1:8981' } },
                 weight: 1,
               },
-            ],
+            },
           },
         },
         maximumTotalTreeSizeBytes: 64 * 1024 * 1024,

kubernetes/config/common.libsonnet

@@ -2,34 +2,32 @@
   blobstore: {
     contentAddressableStorage: {
       sharding: {
-        hashInitialization: 11946695773637837490,
-        shards: [
-          {
+        shards: {
+          "0": {
             backend: { grpc: { address: 'storage-0.storage.buildbarn:8981' } },
             weight: 1,
           },
-          {
+          "1": {
             backend: { grpc: { address: 'storage-1.storage.buildbarn:8981' } },
             weight: 1,
           },
-        ],
+        },
       },
     },
     actionCache: {
       completenessChecking: {
         backend: {
           sharding: {
-            hashInitialization: 14897363947481274433,
-            shards: [
-              {
+            shards: {
+              "0": {
                 backend: { grpc: { address: 'storage-0.storage.buildbarn:8981' } },
                 weight: 1,
               },
-              {
+              "1": {
                 backend: { grpc: { address: 'storage-1.storage.buildbarn:8981' } },
                 weight: 1,
               },
-            ],
+            },
           },
         },
         maximumTotalTreeSizeBytes: 64 * 1024 * 1024,

tools/expected-docker-and-k8s-configs.diff

@@ -50,7 +50,7 @@ index 7e0103f..7f08b6d 100644
 --- a/kubernetes/config/runner-ubuntu22-04.jsonnet
 +++ b/docker-compose/config/runner-ubuntu22-04.jsonnet
 @@ -2,7 +2,7 @@ local common = import 'common.libsonnet';
- 
+
  {
    buildDirectoryPath: '/worker/build',
 -  // TODO: global: common.global,
@@ -64,7 +64,7 @@ index 50cabe5..ab10376 100644
 +++ b/docker-compose/config/worker-hardlinking-ubuntu22-04.jsonnet
 @@ -1,13 +1,14 @@
  local common = import 'common.libsonnet';
- 
+
 +// DO NOT USE the hardlinking configuration below unless really needed.
 +// This example only exists for reference in situations
 +// where the more efficient FUSE worker is not supported.