Skip to content

Commit 23bc7ac

Browse files
committed
chart: regenerate manifests/ate-install/ from current Helm chart
Re-runs `make helm-template` so the checked-in render matches the chart. Brings in rustfs.yaml, the s3-backed atelet storage envvars, the trimmed valkey manifest, and drops the no-longer-templated sandboxconfig-gvisor and sandboxconfig-validation manifests. `make verify-helm-template` now passes.
1 parent f54e98d commit 23bc7ac

10 files changed

Lines changed: 175 additions & 116 deletions

manifests/ate-install/ate-api-server-envvars.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ data:
2525
ATE_API_REDIS_USE_IAM_AUTH: "false"
2626
ATE_API_REDIS_TLS_SERVER_NAME: ""
2727
ATE_API_REDIS_CLIENT_CERT: ""
28-
ATE_API_K8SJWT_ISSUER: ""
28+
ATE_API_K8SJWT_ISSUER: "https://kubernetes.default.svc.cluster.local"

manifests/ate-install/ate-api-server.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ rules:
3232
- apiGroups: ["ate.dev"]
3333
resources: ["actortemplates", "workerpools", "sandboxconfigs"]
3434
verbs: ["get", "watch", "list"]
35-
- apiGroups: ["ate.dev"]
36-
resources: ["workerpools"]
37-
verbs: ["get", "watch", "list"]
3835
# Secret reads for env source resolution are intentionally NOT granted
3936
# cluster-wide here. Each demo / tenant is responsible for granting
4037
# ate-api-server read access only to the specific Secrets referenced by its
@@ -104,6 +101,10 @@ spec:
104101
- "--session-id-jwt-pool=/run/session-id-jwt-pool/pool.json"
105102
- "--session-id-ca-pool=/run/session-id-ca-pool/pool.json"
106103
- "--workerpool-ca-certs=/run/workerpool-ca-certs/trust-bundle.pem"
104+
# Pass the chart-resolved namespace so the atelet pod informer
105+
# watches the correct namespace when substrate is installed as a
106+
# subchart (the binary default is "ate-system").
107+
- "--atelet-namespace=ate-system"
107108
env:
108109
- name: POD_NAME
109110
valueFrom:

manifests/ate-install/ate-controller.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,13 @@ spec:
7171
containers:
7272
- name: ate-controller
7373
image: ko://github.com/agent-substrate/substrate/cmd/atecontroller
74+
args:
75+
# The atecontroller binary defaults --ateapi-conn-spec to
76+
# dns:///api.ate-system.svc:443, which is correct only for the
77+
# canonical render (release name "substrate" in namespace
78+
# "ate-system"). Pass the chart-resolved Service so the controller
79+
# dials the right backend when substrate is installed as a subchart.
80+
- "--ateapi-conn-spec=dns:///api.ate-system.svc:443"
7481
ports:
7582
- name: metrics
7683
containerPort: 8080

manifests/ate-install/atelet.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,17 @@ spec:
7777
fieldRef:
7878
fieldPath: spec.nodeName
7979
- name: ATE_STORAGE_BACKEND
80-
value: "gcs"
80+
value: "s3"
81+
- name: AWS_REGION
82+
value: us-east-1
83+
- name: AWS_ENDPOINT_URL
84+
value: http://rustfs.ate-system.svc:9000
85+
- name: AWS_S3_USE_PATH_STYLE
86+
value: "true"
87+
- name: AWS_ACCESS_KEY_ID
88+
value: "rustfsadmin"
89+
- name: AWS_SECRET_ACCESS_KEY
90+
value: "rustfsadmin"
8191
ports:
8292
- name: grpc
8393
containerPort: 8085

manifests/ate-install/atenet-dns.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@ spec:
170170
- "--log-level=debug"
171171
- "--interval=10s"
172172
- "--corefile-path=/etc/coredns/Corefile"
173+
# Pass the chart-resolved names/namespace so the controller looks up
174+
# the correct Services when substrate is installed as a subchart.
175+
- "--system-namespace=ate-system"
176+
- "--router-service-name=atenet-router"
177+
- "--dns-service-name=dns"
173178
volumeMounts:
174179
- name: dns-config-volume
175180
mountPath: /etc/coredns

manifests/ate-install/atenet-router.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@ spec:
161161
- "--standalone"
162162
- "--networking-mode=agentgateway"
163163
- "--namespace=ate-system"
164+
# Pass the chart-resolved router Service name so /statusz looks up the
165+
# correct Service when substrate is installed as a subchart.
166+
- "--router-service-name=atenet-router"
164167
- "--port-http=8080"
165168
- "--port-extproc=50051"
166169
- "--extproc-address=127.0.0.1"

manifests/ate-install/rustfs.yaml

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
# Copyright 2026 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# DO NOT EDIT — generated from charts/substrate by hack/render-manifests.sh.
16+
# Run `make helm-template` to regenerate.
17+
18+
apiVersion: v1
19+
kind: PersistentVolumeClaim
20+
metadata:
21+
name: rustfs-data
22+
namespace: ate-system
23+
spec:
24+
accessModes:
25+
- ReadWriteOnce
26+
resources:
27+
requests:
28+
storage: 1Gi
29+
---
30+
apiVersion: v1
31+
kind: Service
32+
metadata:
33+
name: rustfs
34+
namespace: ate-system
35+
spec:
36+
selector:
37+
app: rustfs
38+
ports:
39+
- name: api
40+
port: 9000
41+
targetPort: 9000
42+
- name: console
43+
port: 9001
44+
targetPort: 9001
45+
type: ClusterIP
46+
---
47+
apiVersion: apps/v1
48+
kind: Deployment
49+
metadata:
50+
name: rustfs
51+
namespace: ate-system
52+
spec:
53+
replicas: 1
54+
selector:
55+
matchLabels:
56+
app: rustfs
57+
template:
58+
metadata:
59+
labels:
60+
app: rustfs
61+
spec:
62+
securityContext:
63+
runAsUser: 10001
64+
runAsGroup: 10001
65+
fsGroup: 10001
66+
containers:
67+
- name: rustfs
68+
image: rustfs/rustfs:1.0.0-beta.3@sha256:378642b05b7dcb4849fb77ebe6aca4ced1c3f66e7e504247df95a5c9018d3358
69+
imagePullPolicy: IfNotPresent
70+
ports:
71+
- containerPort: 9000
72+
name: api
73+
- containerPort: 9001
74+
name: console
75+
env:
76+
- name: RUSTFS_ADDRESS
77+
value: ":9000"
78+
- name: RUSTFS_CONSOLE_ADDRESS
79+
value: ":9001"
80+
- name: RUSTFS_CONSOLE_ENABLE
81+
value: "true"
82+
- name: RUSTFS_VOLUMES
83+
value: "/data"
84+
- name: RUSTFS_ACCESS_KEY
85+
value: "rustfsadmin"
86+
- name: RUSTFS_SECRET_KEY
87+
value: "rustfsadmin"
88+
volumeMounts:
89+
- name: data
90+
mountPath: /data
91+
volumes:
92+
- name: data
93+
persistentVolumeClaim:
94+
claimName: rustfs-data
95+
---
96+
apiVersion: batch/v1
97+
kind: Job
98+
metadata:
99+
name: rustfs-bucket-init
100+
namespace: ate-system
101+
spec:
102+
backoffLimit: 10
103+
template:
104+
spec:
105+
restartPolicy: OnFailure
106+
containers:
107+
- name: create-bucket
108+
image: amazon/aws-cli:2.17.0@sha256:643507c10ada7964ca6157b3d799f030b90577643da9955d319a77399ed80d73
109+
env:
110+
- name: AWS_ACCESS_KEY_ID
111+
value: "rustfsadmin"
112+
- name: AWS_SECRET_ACCESS_KEY
113+
value: "rustfsadmin"
114+
- name: AWS_REGION
115+
value: us-east-1
116+
- name: AWS_ENDPOINT_URL
117+
value: http://rustfs.ate-system.svc:9000
118+
command:
119+
- /bin/sh
120+
- -c
121+
- |
122+
set -e
123+
for i in $(seq 1 60); do
124+
if aws s3api head-bucket --bucket ate-snapshots 2>/dev/null; then
125+
echo "bucket ate-snapshots already exists"
126+
exit 0
127+
fi
128+
if aws s3api create-bucket --bucket ate-snapshots 2>/dev/null; then
129+
echo "bucket ate-snapshots created"
130+
exit 0
131+
fi
132+
echo "waiting for rustfs to become available... ($i/60)"
133+
sleep 2
134+
done
135+
echo "timed out waiting for rustfs"
136+
exit 1

manifests/ate-install/sandboxconfig-gvisor.yaml

Lines changed: 0 additions & 35 deletions
This file was deleted.

manifests/ate-install/sandboxconfig-validation.yaml

Lines changed: 0 additions & 54 deletions
This file was deleted.

manifests/ate-install/valkey.yaml

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ data:
3333
tls-key-file /run/servicedns.podcert.ate.dev/credential-bundle.pem
3434
tls-ca-cert-file /etc/valkey-ca/ca.crt
3535
tls-auth-clients yes
36-
# Reload the cert every 12h.
37-
tls-auto-reload-interval 43200
3836
3937
# Enable cluster mode
4038
cluster-enabled yes
@@ -92,21 +90,8 @@ spec:
9290
spec:
9391
containers:
9492
- name: valkey
95-
image: valkey/valkey:9.1@sha256:4963247afc4cd33c7d3b2d2816b9f7f8eeebab148d29056c2ca4d7cbc966f2d9
96-
command:
97-
- /bin/sh
98-
- -c
99-
- |
100-
set -e
101-
POD_DNS="${HOSTNAME}.valkey-cluster-service.ate-system.svc"
102-
cp /etc/valkey/valkey.conf /tmp/valkey.conf
103-
{
104-
echo "cluster-announce-hostname ${POD_DNS}"
105-
echo "cluster-announce-tls-port 6379"
106-
echo "cluster-announce-bus-port 16379"
107-
echo "cluster-preferred-endpoint-type hostname"
108-
} >> /tmp/valkey.conf
109-
exec valkey-server /tmp/valkey.conf
93+
image: valkey/valkey:8.0
94+
command: ["valkey-server", "/etc/valkey/valkey.conf"]
11095
ports:
11196
- name: valkey
11297
containerPort: 6379
@@ -164,7 +149,7 @@ spec:
164149
restartPolicy: OnFailure
165150
containers:
166151
- name: init
167-
image: valkey/valkey:9.1@sha256:4963247afc4cd33c7d3b2d2816b9f7f8eeebab148d29056c2ca4d7cbc966f2d9
152+
image: valkey/valkey:8.0
168153
volumeMounts:
169154
- name: servicedns
170155
mountPath: /run/servicedns.podcert.ate.dev
@@ -184,10 +169,11 @@ spec:
184169
done
185170
done
186171
187-
echo "All pods resolved. Building stable node list..."
188-
VALKEY_NODES=""
172+
echo "All pods resolved. Getting IPs..."
173+
POD_IPS=""
189174
for i in 0 1 2 3 4 5; do
190-
VALKEY_NODES="${VALKEY_NODES} valkey-cluster-${i}.valkey-cluster-service.ate-system.svc:6379"
175+
ip=$(getent hosts valkey-cluster-${i}.valkey-cluster-service.ate-system.svc | awk '{print $1}')
176+
POD_IPS="${POD_IPS} ${ip}:6379"
191177
done
192178
193179
echo "Checking if Valkey cluster is already initialized..."
@@ -204,7 +190,7 @@ spec:
204190
--cacert /etc/valkey-ca/ca.crt \
205191
--cert /run/servicedns.podcert.ate.dev/credential-bundle.pem \
206192
--key /run/servicedns.podcert.ate.dev/credential-bundle.pem \
207-
--cluster create ${VALKEY_NODES} \
193+
--cluster create ${POD_IPS} \
208194
--cluster-replicas 1 \
209195
--cluster-yes
210196
echo "Cluster initialization complete!"

0 commit comments

Comments
 (0)