Skip to content

Commit

Permalink
Hook up bb-event-service to all Docker-based deployments.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ed Schouten committed Feb 26, 2019
1 parent 092b7e0 commit 6828b75
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 9 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ following setup:
official [Debian 8](https://console.cloud.google.com/marketplace/details/google/rbe-debian8)
and [Ubuntu 16.04](https://console.cloud.google.com/marketplace/details/google/rbe-ubuntu16-04)
images.
- An installation of [Buildbarn Browser](https://github.com/buildbarn/bb-browser).
- An installation of [the Buildbarn Browser](https://github.com/buildbarn/bb-browser).
- An installation of [the Buildbarn Event Service](https://github.com/buildbarn/bb-event-service/).

Below is a diagram of what this setup Buildbarn looks like. In this
diagram, the arrows represent the direction in which network connections
Expand Down Expand Up @@ -52,12 +53,14 @@ to your `~/.bazelrc`, followed by the following set of options that are
specific to your environment:

```
build:mycluster-debian8 --bes_backend=fill-in-your-cluster-hostname-here:8983
build:mycluster-debian8 --config=remote
build:mycluster-debian8 --config=rbe-debian8
build:mycluster-debian8 --jobs=64
build:mycluster-debian8 --remote_executor=fill-in-your-cluster-hostname-here:8980
build:mycluster-debian8 --remote_instance_name=debian8
build:mycluster-ubuntu16-04 --bes_backend=fill-in-your-cluster-hostname-here:8983
build:mycluster-ubuntu16-04 --config=remote
build:mycluster-ubuntu16-04 --config=rbe-ubuntu16-04
build:mycluster-ubuntu16-04 --jobs=64
Expand Down
Binary file modified bb-overview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion bb-overview.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<mxfile modified="2019-02-17T14:36:00.167Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/71.0.3578.98 Chrome/71.0.3578.98 Safari/537.36" etag="JDZgB0vM9RY0D_9yO8t9" version="10.2.3" type="device"><diagram id="d94220cd-8602-7684-2362-185c2d5baf20" name="Page-1">7Ztbc5s4FIB/jR/TAcQtj46bpjNtdztJZ9o+dbgoNhMZuULEdn79SiDACNmhDmDobB486AACvnPR0ZEyA4v17o54m9UXHEI0M7RwNwPvZ4Zh2ib75YJ9LnAcOxcsSRTmIr0SPEQvUAg1IU2jECa1CynGiEabujDAcQwDWpN5hOBt/bJHjOpP3XhL2BA8BB5qSr9HIV3lUtfSKvlHGC1XxZN1TZzxveBpSXAai+fNDPCY/eWn117Rl7g+WXkh3h6IwO0MLAjGND9a7xYQcbQFtvy+D0fOlu9NYEzb3PBx88/L0+dPD9i1b7/d/d64LytyZTp5N88eSmHxHdnb0n1BKPtGyHvRZuBmu4oofNh4AT+7ZSbBZCu6Rqyls8PHCKEFRphk9xZEwE3zbcUHPENC4e5AJN7+DuI1pGTPLhFnDVuQFJYGHNHeVnrTC9qrA52ZQuYJU1mWXVe42IEg9if07AnRsyR69oD0gNkjqBjHsCNGWp1RyeOAkWsqGIH+TMzqmFwHmBwJEwBNTEBTYLJ7o9S1fXVAyb6WKCmMaWBK2ggpuRIl/dKUwPX4KMkeZ1yekjs+SrLHleH8cpS6ThB68Dj9ekBKCLsfSLJYfYnvP+F7ev3t5x26Ai2SUJY9b/hhsEcRw0VeR+XnXD/7paBM2P9NKesF9p90maZkkYqky1Cxdntj3cIiJ8oaSKytAVl3HQ0HnEapOPU2EZjSdFOaMJXfPwQno8HpxnvJCi8Bivg3GTai3M8IO1rS8osvOK7IoU4xKegNVzOo+f6vhGKSFX/mTVr3X1mfWgjXKa80IbiL4mXXTPu0zUvCbpEfwzic89ocH0SQlyRRUEfDvpzsfwiMWeMnb7yzeHMX0R/Fdey4OnMUXIJTEsCa51CPLCGtWQcMa5XAJtwDeJaCXSEjEHk0eq7XD1VAxRO+4og77BE/sXVJJfnHiJuMg3qe1I+U7FpyepYTaPSTabf86FYK1wv7bO1eCxzTLEpp8zAkMEk8n5mGoT2Ie7hp2t6aO0z+2+xiHtAIx+zKhResYAvfnGjWYrw+yvSWtejgUq7MW+93xV28sReNVk5uN528MNKReDmQI7Ssr7Zu7kjhQo7gHbp5s9TI3Zx5X5giSJouGEI/8mJ3QuOmKeW++pBFcF2dpRznm/ppTFPd/qWZE2YM3CEZD5ScaO8c6zCovSVwWaMKXNJ4VNbUxhu3ijceWOcnp02v6XxcKekEdd7MXFgs3WLy9PcE0jYLSP0VIJSD1THA08sE2qwV9Ae3RbmwdcTST0SsWt5ttJ9DT2+YOncWLYWsHmfRndZNWivdaa90MLlxavxKB13mJpLSwVGlv83RxzWRnqDOu6yqSDp3uojuKkf/X+lvVLpqn5bIhqpkKBc84uwdK3Owf6e4OHGVZFtk5+wCw9zsqpNFLzdphELfI3HRHXu1vMf6U5jYP5qGsSyJ1i0uoQQ/QWlPnWKbnYeiZczNlplYVmTlOVcUeGguTqyjMOSPUSZ39fTvqLn+wUqIZCr6kKt06hX25jjPMmef71TmqfNI82F5WQIMuSqs5KjYrfYdMovWSpRjXwIdAcPmys35Q1H3a3Un9T6SoUjSqQPOHIoaxuH0NhapsRr9mYJTNKslnaxVrOn0tg50MgBPKL+RA8C5+Y1cuOvOptTbG5UrRiSN47+jSOTKW4CGLBKpibfYQPWmgH4JL1bNQk/a20i8WJe8zzrTi6UFM0sb1osVScIJL55mLV325EFr6WrqPY7Hl/NkRWnhpM2NxJNdeRfOuVmeK2+ulTs625dZs/pf0fzy6v9xwe1/</diagram></mxfile>
<mxfile modified="2019-02-26T15:19:40.856Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/71.0.3578.98 Chrome/71.0.3578.98 Safari/537.36" etag="S0J0tSiDNhT2pVPl0IeG" version="10.2.8" type="device"><diagram id="d94220cd-8602-7684-2362-185c2d5baf20" name="Page-1">7Vxbc5s6EP41fswZQNzy6DhpMtP2nE7TmbZPGS6KrYmMHFnEdn79ERfZRpId4gCGTvPgQSsh4Nv9dlcrTUZgMl/f0mAx+0piiEeWEa9H4HpkWZ5v899MsCkEpul6hWRKUVzKdoJ79ApLoVFKUxTDZWUgIwQztKgKI5IkMGIVWUApWVWHPRJcfeoimEJFcB8FWJX+RDGbFVLfMXbyO4imM/Fk0yh7wiB6mlKSJuXzRhZ4zP+K7nkg5irHL2dBTFZ7InAzAhNKCCuu5usJxBm2Arbivk8HerfvTWHC6txwt/j39enL53viuzc/bp8X/uuMXtilsl4CnELxHfnbso1AKP9GmM1ijMDVaoYYvF8EUda74jbBZTM2x7xl8stHhPGEYELzewUi4Ep92/IDXiBlcL0nKt/+FpI5ZHTDh5S9llsiWZoa8Mv2aqc3U6A929OZXcqC0lSm26l3cPGLErH3oOcOCD1HQs/rED1gtwhUQhLYEEZGFaMtHnsY+bYGI9CeiTkNI9cATJ4EEwAqTMDQwOS2hlLT9tUASu6lhJLGmDpGyeghSr6EknlulMBl/1CSGWedHyW/fyjJjNu68/Oh1HSC0ALjzMsOUcLE/0SXk9nX5Ptn8p1d/vh9iy9AjSSUZ8+L7DLaYMThom9DFRa4fgm3gm3C/l/K+Cyw/aTLtiWLdFWsLR3WfmtY17DIgWINJKydDrFu2ht2uYzSeMnWFgJDWm5KCyZL4ydbw8lScLoKXvPKS4RR9k2Wi1nGM8qvpmz7xWeMK7KrszuES3VqYfiwZITmxZ+xitb3b3xOI4bzNKs0YbhGybRpTNu0TRnsLkshNfJjmMTjrDaXBREcLJcoqkLDv5xufpUw5o3fWeMfJ2uuEfslxvHrosdzxMjr9f591xvR4kN3XVlD9BzEmwV0ClnFgmBcqRaqCtgD2NHgK2QU4oChl2qNUQd6+YRvBGWkFvo13QP6FVMsSUojWN5l7RX9pIkUQ/GkiQoMlIlyG9h+di2zME3FLt4g4YQkLPdlxjiOKVwug5AbkGXcl/dkBuwG84xWxa86xThiiCR85CSIZrAGgwea21hvO9fWchsTnIPwzmmcLohR4fQ+zYWR9oTn4JAffy/Pveo8ruznG6S5WpDMaM7ZF6cYUpWCMQxRkPgDiq625H1Nzaqttehq6nOZw/imYZqw1HQfDHvAGHe6mWN2lMKItEU4tY84LqdXjkuKR9vKW3/9lnjjjnV+dHH1ls77lZQOUOdq5sJ96YrQpz/HkdbZZmqvTKENVocAHl4mUGdHoT1waxQVa3ss84jHquTdllPXYw0wTJnNuCxH3gpp0GU1mZrUVrpXX+lgcHGq/0oHTeYmktLBQaV/jOj9WkgPUOdNVlUknXtNeHcd0f8q/YNK153mKrOhXTJUCB5J/o47c3CfUyI6Lpb5QdoxH2DZi/WuU8xylSIchwFNxHT81YoZq0/h4vBgGsazJFa1uCWj5AlKJ+80h/ECjKZJZrbcxPIia5ZzoSjA47JjjuI4e4w2uaumfwfN9R37JZKpmF1uTun34dU4zzPnMDvPnKXOPc2H5e0E0GVlTIuj5kzbT8gt2thC2feN0h5gqO7cnB6K3lXgrxWJjuq9J6FI0qkn6+rU/Togbwg0F4v0sFrtmYInmkd2cFvZBzrqgAeU35xqVHJ+IxfumrMp/SFI7Y4RTZPkzygS+fJBoS6LRHrEaxyz+pBDPweLdavQo/bWExabEvucE1ksbZg5Rrcs1iQJR1g8zFq6zOROa+l61FuMx+djsqa0cNTmesJkXz6FA06ksi8f75Inao7Lj2vfm1w9W7f4Dt9Yd9EaR6kuPnAuwxeutAe+ZnpBUZ2jVA2yVqGoxoZqL0o7jb96fJvcuam9oLI+ekRSotnbPFZpfMTczhZ/ZbIZzmmsVewMSBO1zdoWT62A1mLBe43qqMNSF2s9WfA7p4YCaYPZbmy9z5u7/y1QDN/9Awdw8z8=</diagram></mxfile>
1 change: 1 addition & 0 deletions docker-compose/config-storage/blobstore.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ action_cache {
offset_cache_size: 1000
data_file_size_bytes: 104857600 # 100 MiB
data_allocation_chunk_size_bytes: 1048576 # 1 MiB
instance: "bb-event-service"
instance: "debian8"
instance: "ubuntu16-04"
}
Expand Down
21 changes: 15 additions & 6 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ services:
storage-0:
image: buildbarn/bb-storage:20190211T175559Z-ee2cb65
command:
- -allow-ac-updates-for-instance=bb-event-service
- -allow-ac-updates-for-instance=debian8
- -allow-ac-updates-for-instance=ubuntu16-04
expose:
Expand All @@ -27,6 +28,7 @@ services:
storage-1:
image: buildbarn/bb-storage:20190211T175559Z-ee2cb65
command:
- -allow-ac-updates-for-instance=bb-event-service
- -allow-ac-updates-for-instance=debian8
- -allow-ac-updates-for-instance=ubuntu16-04
expose:
Expand All @@ -38,10 +40,17 @@ services:
- ./storage-ac-1:/storage-ac
- ./storage-cas-1:/storage-cas

browser:
image: buildbarn/bb-browser:20190210T072316Z-0f6bc13
event-service:
image: buildbarn/bb-event-service:20190225T222112Z-b9170c2
ports:
- 7983:80
- 8983:8983
volumes:
- ./config-storage-clients:/config
browser:
image: buildbarn/bb-browser:20190226T150148Z-53f3290
ports:
- 7984:80
volumes:
- ./config-storage-clients:/config

Expand All @@ -54,11 +63,11 @@ services:
worker-debian8:
image: buildbarn/bb-worker:20190210T161704Z-6f6bded
command:
- -browser-url=http://localhost:7983/
- -browser-url=http://localhost:7984/
- -concurrency=4
- -scheduler=scheduler-debian8:8981
ports:
- 7984:80
- 7985:80
volumes:
- ./config-storage-clients:/config
- ./worker-debian8:/worker
Expand All @@ -77,11 +86,11 @@ services:
worker-ubuntu16-04:
image: buildbarn/bb-worker:20190210T161704Z-6f6bded
command:
- -browser-url=http://localhost:7983/
- -browser-url=http://localhost:7984/
- -concurrency=4
- -scheduler=scheduler-ubuntu16-04:8981
ports:
- 17984:80
- 17985:80
volumes:
- ./config-storage-clients:/config
- ./worker-ubuntu16-04:/worker
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/browser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
app: browser
spec:
containers:
- image: buildbarn/bb-browser:20190210T072316Z-0f6bc13
- image: buildbarn/bb-browser:20190226T150148Z-53f3290
name: browser
ports:
- containerPort: 80
Expand Down
44 changes: 44 additions & 0 deletions kubernetes/event-service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: event-service
namespace: buildbarn
spec:
replicas: 1
selector:
matchLabels:
app: event-service
template:
metadata:
labels:
app: event-service
spec:
containers:
- image: buildbarn/bb-event-service:20190225T222112Z-b9170c2
name: event-service
ports:
- containerPort: 8983
protocol: TCP
volumeMounts:
- mountPath: /config
name: config
volumes:
- configMap:
name: config-storage-clients
name: config
---
apiVersion: v1
kind: Service
metadata:
annotations:
prometheus.io/port: "80"
prometheus.io/scrape: "true"
name: event-service
namespace: buildbarn
spec:
ports:
- port: 8983
protocol: TCP
selector:
app: event-service
type: LoadBalancer

0 comments on commit 6828b75

Please sign in to comment.