Revert "Revert "Revert "[goma] Update config for fuchsia-infra-goma-prod/rbe-prod1:"""
This reverts commit 76bea462661c76b46d10d48233cd855bfd744f24.
Reason for revert: Flutter windows builds failing.
Change-Id: I3853ea096c78c544268e48bab93d6642598beaa0
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/config/+/439660
Reviewed-by: Nathan Mulcahey <nmulcahey@google.com>
Reviewed-by: Haowei Wu <haowei@google.com>
diff --git a/goma/k8s/rbe-prod1/goma/deploy_auth-server.yaml b/goma/k8s/rbe-prod1/goma/deploy_auth-server.yaml
index 1117de7..161f7f3 100644
--- a/goma/k8s/rbe-prod1/goma/deploy_auth-server.yaml
+++ b/goma/k8s/rbe-prod1/goma/deploy_auth-server.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
annotations:
- buildtag: 20201014165148
+ buildtag: 20200810043737
imagetag: latest
labels:
app: auth-server
@@ -31,7 +31,7 @@
- --service-account-json-dir=/etc/goma/service-accounts
- --remoteexec-addr=remotebuildexecution.googleapis.com:443
- --remote-instance-name=projects/fuchsia-infra-goma-prod/instances/default_instance
- image: gcr.io/fuchsia-toolchain-images-gcr/auth-server@sha256:8fdb81a2d3b6c7e5a1e8568bedb593a89eacbd2a3eeaae1a8c845578e2d9e083
+ image: gcr.io/fuchsia-toolchain-images-gcr/auth-server@sha256:257a05c85ee75a9b59ddc6afa72882e1956504d8a741ff404f8aac4ffb7b9209
livenessProbe:
httpGet:
path: /healthz
diff --git a/goma/k8s/rbe-prod1/goma/deploy_exec-server.yaml b/goma/k8s/rbe-prod1/goma/deploy_exec-server.yaml
index 84dc4b5..03f96c8 100644
--- a/goma/k8s/rbe-prod1/goma/deploy_exec-server.yaml
+++ b/goma/k8s/rbe-prod1/goma/deploy_exec-server.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
annotations:
- buildtag: 20201014165148
+ buildtag: 20200810043737
imagetag: latest
labels:
app: exec-server
@@ -37,16 +37,14 @@
envFrom:
- configMapRef:
name: memorystore
- image: gcr.io/fuchsia-toolchain-images-gcr/exec-server@sha256:028a488dbcf2a3fdf8d0c10a787b77e537bcadc383633beb51bd1b7a9b8e29f9
+ image: gcr.io/fuchsia-toolchain-images-gcr/exec-server@sha256:477ee7398b85d1629e81b1b5dca03a63dbfa49d1d7e2b9d89fe3f8006b71a720
livenessProbe:
- failureThreshold: 20
httpGet:
path: /healthz
port: 8081
scheme: HTTP
- initialDelaySeconds: 60
- periodSeconds: 15
- timeoutSeconds: 5
+ initialDelaySeconds: 10
+ periodSeconds: 5
name: exec-server
ports:
- containerPort: 5050
@@ -54,14 +52,12 @@
- containerPort: 8081
protocol: TCP
readinessProbe:
- failureThreshold: 20
httpGet:
path: /healthz
port: 8081
scheme: HTTP
- initialDelaySeconds: 60
- periodSeconds: 15
- timeoutSeconds: 5
+ initialDelaySeconds: 10
+ periodSeconds: 5
resources:
limits:
cpu: 500m
diff --git a/goma/k8s/rbe-prod1/goma/deploy_execlog-server.yaml b/goma/k8s/rbe-prod1/goma/deploy_execlog-server.yaml
index 53c88db..1101651 100644
--- a/goma/k8s/rbe-prod1/goma/deploy_execlog-server.yaml
+++ b/goma/k8s/rbe-prod1/goma/deploy_execlog-server.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
annotations:
- buildtag: 20201014165148
+ buildtag: 20200810043737
imagetag: latest
labels:
app: execlog-server
@@ -26,7 +26,7 @@
- command:
- /opt/goma/bin/execlog_server
- --project-id=fuchsia-infra-goma-prod
- image: gcr.io/fuchsia-toolchain-images-gcr/execlog-server@sha256:479b1d558f189f5eb4d2f3906dc2a767ee899c8b8cae2dba30b992cbe663f0be
+ image: gcr.io/fuchsia-toolchain-images-gcr/execlog-server@sha256:6d0664b89833c54cb285bb36a40b9f10f0b67201c688e5a589c2fa7dd9bbb56d
livenessProbe:
httpGet:
path: /healthz
diff --git a/goma/k8s/rbe-prod1/goma/deploy_file-server.yaml b/goma/k8s/rbe-prod1/goma/deploy_file-server.yaml
index b88e84f..92dec51 100644
--- a/goma/k8s/rbe-prod1/goma/deploy_file-server.yaml
+++ b/goma/k8s/rbe-prod1/goma/deploy_file-server.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
annotations:
- buildtag: 20201014165148
+ buildtag: 20200810043737
imagetag: latest
labels:
app: file-server
@@ -27,7 +27,7 @@
- /opt/goma/bin/file_server
- --trace-project-id=fuchsia-infra-goma-prod
- --bucket=fuchsia-infra-goma-prod-rbe-prod1-file-cache
- image: gcr.io/fuchsia-toolchain-images-gcr/file-server@sha256:c61ead40153febf5ec333f3fbc12fd196cd1c56a6e93f4bf02d42c08f4b13009
+ image: gcr.io/fuchsia-toolchain-images-gcr/file-server@sha256:10d2e98e8fc1b909ddecee30a0ba3ca0aecf6a3c9bf3500647ee68605f88fc18
livenessProbe:
httpGet:
path: /healthz
diff --git a/goma/k8s/rbe-prod1/goma/deploy_frontend.yaml b/goma/k8s/rbe-prod1/goma/deploy_frontend.yaml
index ee0187b..88ecff9 100644
--- a/goma/k8s/rbe-prod1/goma/deploy_frontend.yaml
+++ b/goma/k8s/rbe-prod1/goma/deploy_frontend.yaml
@@ -2,7 +2,7 @@
kind: Deployment
metadata:
annotations:
- buildtag: 20201014165148
+ buildtag: 20200810043737
imagetag: latest
labels:
app: frontend
@@ -39,7 +39,7 @@
>
- --gport=5050
- --port=80
- image: gcr.io/fuchsia-toolchain-images-gcr/frontend@sha256:926d090c160595f47c809290c0ba27a5d9bbb59fa60a11d49db303642a94e279
+ image: gcr.io/fuchsia-toolchain-images-gcr/frontend@sha256:17e5994fb85bd57cffefa47497b71f7f06c11fd3ffc0dd14495b183a48ad04bd
livenessProbe:
failureThreshold: 20
httpGet:
