[goma] Update config for fuchsia-infra-goma-prod/rbe-prod1:
Using gomatools tag: latest
Exempt-From-Owner-Approval: Roller.
Change-Id: Idf0169831a07e6e09b4c56099d65ae45dca59b8b
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/config/+/970021
Reviewed-by: Roller <infra-config-roller@fuchsia-infra.iam.gserviceaccount.com>
Reviewed-by: Haowei Wu <haowei@google.com>
Reviewed-by: Oliver Newman <olivernewman@google.com>
diff --git a/goma/k8s/rbe-prod1/goma/configmap-acl.yaml b/goma/k8s/rbe-prod1/goma/configmap-acl.yaml
index bbd0802..e9ba225 100644
--- a/goma/k8s/rbe-prod1/goma/configmap-acl.yaml
+++ b/goma/k8s/rbe-prod1/goma/configmap-acl.yaml
@@ -5,7 +5,7 @@
# Non-Fuchsia Infra SAs:
# * 962258612125-compute@developer.gserviceaccount.com - Syzkaller (Fuchsia Security)
# * flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com - Flutter (Flutter)
-# flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com - Flutter (b/197566824)
+# * flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com - Flutter (b/197566824)
# * flutter-try-builder@chops-service-accounts.iam.gserviceaccount.com - Flutter (Flutter)
apiVersion: v1
diff --git a/goma/k8s/rbe-prod1/goma/deploy_auth-server.yaml b/goma/k8s/rbe-prod1/goma/deploy_auth-server.yaml
index 58fab41..7fc60a3 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: "20210702_170646"
+ buildtag: "20240105_181008"
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:ce01d48520d041bdd9c78b8543f961d3d4df4ba4e38086089693826e2b038524
+ image: gcr.io/fuchsia-toolchain-images-gcr/auth-server@sha256:ab5d0da6effd1db29d6873929100ddb1bb15a52035f53148c14e3fba0bd011aa
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 61914be..79e1275 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: "20210702_170646"
+ buildtag: "20240105_181008"
imagetag: latest
labels:
app: exec-server
@@ -39,7 +39,7 @@
envFrom:
- configMapRef:
name: memorystore
- image: gcr.io/fuchsia-toolchain-images-gcr/exec-server@sha256:4ac412a7856cf1d41e04f55324f87a41eaca783dbc176c9ec17bb8d3a1cae649
+ image: gcr.io/fuchsia-toolchain-images-gcr/exec-server@sha256:2f0eaf55c8e88fa91d7dc6c7c7b2f7d5536429c2ff3fc21732cbd089e640e57d
livenessProbe:
failureThreshold: 20
httpGet:
diff --git a/goma/k8s/rbe-prod1/goma/deploy_execlog-server.yaml b/goma/k8s/rbe-prod1/goma/deploy_execlog-server.yaml
index e24be52..c0c548f 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: "20210702_170646"
+ buildtag: "20240105_181008"
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:75acee85cd71a3a30c3b9f016aa17472146ac3a54eececb2da60f1afe96c5a7b
+ image: gcr.io/fuchsia-toolchain-images-gcr/execlog-server@sha256:8740d804c4bb3af9858a50a36dd4a66d045215b9573cf99b23a68e187e94a744
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 06e01c0..b166b0e 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: "20210702_170646"
+ buildtag: "20240105_181008"
imagetag: latest
labels:
app: file-server
@@ -29,7 +29,7 @@
- --redis-max-idle-conns=16
- --redis-max-active-conns=32
- --bucket=fuchsia-infra-goma-prod-rbe-prod1-file-cache
- image: gcr.io/fuchsia-toolchain-images-gcr/file-server@sha256:03c36f1af3ecd0b5d4a9f2c5c544bdb3d8e36e72a8c7ef17877c1fe99abdcfc3
+ image: gcr.io/fuchsia-toolchain-images-gcr/file-server@sha256:9011ebd085d82d8715bb13b67fc2bedbe8dc4ae75d388c1b9221ea7f18dcb870
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 c0061e6..ab73cc0 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: "20210702_170646"
+ buildtag: "20240105_181008"
imagetag: latest
labels:
app: frontend
@@ -39,7 +39,7 @@
>
- --gport=5050
- --port=80
- image: gcr.io/fuchsia-toolchain-images-gcr/frontend@sha256:240ee6ba6b509a724a5295ec1da36a3fee26cb461d1c461217ffa6380819fcd9
+ image: gcr.io/fuchsia-toolchain-images-gcr/frontend@sha256:81d6cefe6bef9223ef5a3f6b69519bf6f46db592a4d04726f1e6a1e92ce08a30
livenessProbe:
failureThreshold: 20
httpGet:
diff --git a/goma/k8s/rbe-prod1/goma/hpa_auth-server.yaml b/goma/k8s/rbe-prod1/goma/hpa_auth-server.yaml
index 2c97d8e..d1d7428 100644
--- a/goma/k8s/rbe-prod1/goma/hpa_auth-server.yaml
+++ b/goma/k8s/rbe-prod1/goma/hpa_auth-server.yaml
@@ -1,4 +1,4 @@
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
name: auth-server
diff --git a/goma/k8s/rbe-prod1/goma/hpa_exec-server.yaml b/goma/k8s/rbe-prod1/goma/hpa_exec-server.yaml
index 7c629ac..5fc1036 100644
--- a/goma/k8s/rbe-prod1/goma/hpa_exec-server.yaml
+++ b/goma/k8s/rbe-prod1/goma/hpa_exec-server.yaml
@@ -1,4 +1,4 @@
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
name: exec-server
diff --git a/goma/k8s/rbe-prod1/goma/hpa_execlog-server.yaml b/goma/k8s/rbe-prod1/goma/hpa_execlog-server.yaml
index 6afa06b..8301084 100644
--- a/goma/k8s/rbe-prod1/goma/hpa_execlog-server.yaml
+++ b/goma/k8s/rbe-prod1/goma/hpa_execlog-server.yaml
@@ -1,4 +1,4 @@
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
name: execlog-server
diff --git a/goma/k8s/rbe-prod1/goma/hpa_file-server.yaml b/goma/k8s/rbe-prod1/goma/hpa_file-server.yaml
index 1ef9276..bd17533 100644
--- a/goma/k8s/rbe-prod1/goma/hpa_file-server.yaml
+++ b/goma/k8s/rbe-prod1/goma/hpa_file-server.yaml
@@ -1,4 +1,4 @@
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
name: file-server
diff --git a/goma/k8s/rbe-prod1/goma/hpa_frontend.yaml b/goma/k8s/rbe-prod1/goma/hpa_frontend.yaml
index 518ed49..75d129a 100644
--- a/goma/k8s/rbe-prod1/goma/hpa_frontend.yaml
+++ b/goma/k8s/rbe-prod1/goma/hpa_frontend.yaml
@@ -1,4 +1,4 @@
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
name: frontend
diff --git a/goma/k8s/rbe-prod1/ingress/endpoints.yaml b/goma/k8s/rbe-prod1/ingress/endpoints.yaml
index 6366d5d..de2ee91 100644
--- a/goma/k8s/rbe-prod1/ingress/endpoints.yaml
+++ b/goma/k8s/rbe-prod1/ingress/endpoints.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
@@ -12,19 +12,31 @@
- http:
paths:
- backend:
- serviceName: frontend
- servicePort: http
+ service:
+ name: frontend
+ port:
+ name: http
path: /cxx-compiler-service/*
+ pathType: ImplementationSpecific
- backend:
- serviceName: frontend
- servicePort: http2
+ service:
+ name: frontend
+ port:
+ name: http2
path: /devtools_goma.LogService/*
+ pathType: ImplementationSpecific
- backend:
- serviceName: frontend
- servicePort: http2
+ service:
+ name: frontend
+ port:
+ name: http2
path: /devtools_goma.ExecService/*
+ pathType: ImplementationSpecific
- backend:
- serviceName: frontend
- servicePort: http2
+ service:
+ name: frontend
+ port:
+ name: http2
path: /devtools_goma.FileService/*
+ pathType: ImplementationSpecific
tls: null
diff --git a/goma/k8s/rbe-prod1/templates/goma/configmap-acl.yaml.custom b/goma/k8s/rbe-prod1/templates/goma/configmap-acl.yaml.custom
index e4afed9..e9ba225 100644
--- a/goma/k8s/rbe-prod1/templates/goma/configmap-acl.yaml.custom
+++ b/goma/k8s/rbe-prod1/templates/goma/configmap-acl.yaml.custom
@@ -5,6 +5,7 @@
# Non-Fuchsia Infra SAs:
# * 962258612125-compute@developer.gserviceaccount.com - Syzkaller (Fuchsia Security)
# * flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com - Flutter (Flutter)
+# * flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com - Flutter (b/197566824)
# * flutter-try-builder@chops-service-accounts.iam.gserviceaccount.com - Flutter (Flutter)
apiVersion: v1
@@ -24,6 +25,7 @@
emails: "962258612125-compute@developer.gserviceaccount.com"
emails: "firebase-hosting-deployer@fuchsia-infra.iam.gserviceaccount.com"
emails: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
+ emails: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
emails: "flutter-try-builder@chops-service-accounts.iam.gserviceaccount.com"
emails: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
emails: "fuchsia-internal-prod-builder@fuchsia-infra.iam.gserviceaccount.com"
@@ -32,6 +34,7 @@
emails: "fuchsia-try-builder@fuchsia-infra.iam.gserviceaccount.com"
emails: "global-integration-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
emails: "global-integration-try-builder@fuchsia-infra.iam.gserviceaccount.com"
+ emails: "infra-try-builder@fuchsia-infra.iam.gserviceaccount.com"
emails: "releases-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
emails: "releases-prod-builder@fuchsia-infra.iam.gserviceaccount.com"
emails: "releases-try-builder@fuchsia-infra.iam.gserviceaccount.com"
