Fix Garage config: use top-level rpc fields, template admin_token
All checks were successful
CI / lint-and-test (push) Successful in 35s
Deploy Production / deploy (push) Successful in 31s
CI / build (push) Successful in 33s

Garage v1.0.x uses top-level rpc_bind_addr/rpc_secret, not a [rpc]
section. Also template admin_token into [admin] from the sealed secret.
This commit is contained in:
Julia McGhee
2026-03-22 09:42:26 +00:00
parent 3c4ff6fb9f
commit 9d11765405
2 changed files with 12 additions and 12 deletions

View File

@@ -7,15 +7,13 @@ data:
garage.toml: | garage.toml: |
db_engine = "lmdb" db_engine = "lmdb"
replication_factor = 1 replication_factor = 1
compression_level = 1 consistency_mode = "consistent"
metadata_dir = "/mnt/meta" metadata_dir = "/mnt/meta"
data_dir = "/mnt/data" data_dir = "/mnt/data"
[rpc] rpc_bind_addr = "[::]:3901"
bind_addr = "[::]:3901" rpc_secret = "RPC_SECRET_PLACEHOLDER"
# Single-node: rpc_secret is only used for inter-node auth (N/A here)
rpc_secret = "PLACEHOLDER"
[s3_api] [s3_api]
api_bind_addr = "[::]:3900" api_bind_addr = "[::]:3900"
@@ -29,3 +27,4 @@ data:
[admin] [admin]
api_bind_addr = "[::]:3903" api_bind_addr = "[::]:3903"
admin_token = "ADMIN_TOKEN_PLACEHOLDER"

View File

@@ -22,13 +22,20 @@ spec:
command: ["sh", "-c"] command: ["sh", "-c"]
args: args:
- | - |
sed "s/PLACEHOLDER/$RPC_SECRET/" /config-tmpl/garage.toml > /config/garage.toml sed -e "s/RPC_SECRET_PLACEHOLDER/$RPC_SECRET/" \
-e "s/ADMIN_TOKEN_PLACEHOLDER/$ADMIN_TOKEN/" \
/config-tmpl/garage.toml > /config/garage.toml
env: env:
- name: RPC_SECRET - name: RPC_SECRET
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: garage-credentials name: garage-credentials
key: rpc-secret key: rpc-secret
- name: ADMIN_TOKEN
valueFrom:
secretKeyRef:
name: garage-credentials
key: admin-token
volumeMounts: volumeMounts:
- name: config-tmpl - name: config-tmpl
mountPath: /config-tmpl mountPath: /config-tmpl
@@ -46,12 +53,6 @@ spec:
name: web name: web
- containerPort: 3903 - containerPort: 3903
name: admin name: admin
env:
- name: GARAGE_ADMIN_TOKEN
valueFrom:
secretKeyRef:
name: garage-credentials
key: admin-token
resources: resources:
requests: requests:
memory: 256Mi memory: 256Mi