Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

# ── builder ──────────────────────────────────────────────────────────────────
FROM rust:1-slim AS builder
FROM rust:1.88-slim AS builder

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion crates/indexer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

# ── builder ──────────────────────────────────────────────────────────────────
FROM rust:1-slim AS builder
FROM rust:1.88-slim AS builder

WORKDIR /app

Expand Down
3 changes: 0 additions & 3 deletions docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
version: \
3.9\

# Development compose — runs only the infrastructure dependencies.
# The indexer and API service are run locally (cargo run / go run) so that
# code changes reflect immediately without rebuilding containers.
Expand Down
2 changes: 0 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

# Production compose — runs all four services.
# All secrets are passed via environment variables; never hardcode values here.

Expand Down
4 changes: 4 additions & 0 deletions helm/trident/templates/grpc-api-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ spec:
secretKeyRef:
name: {{ .Values.global.existingSecret }}
key: REDIS_URL
livenessProbe:
{{- toYaml .Values.grpcApi.livenessProbe | nindent 12 }}
readinessProbe:
{{- toYaml .Values.grpcApi.readinessProbe | nindent 12 }}
resources:
{{- toYaml .Values.grpcApi.resources | nindent 12 }}
{{- with .Values.grpcApi.nodeSelector }}
Expand Down
8 changes: 8 additions & 0 deletions helm/trident/templates/indexer-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ spec:
- name: indexer
image: "{{ .Values.indexer.image.repository }}:{{ .Values.indexer.image.tag }}"
imagePullPolicy: {{ .Values.global.imagePullPolicy }}
ports:
- name: metrics
containerPort: {{ .Values.indexer.metricsPort }}
protocol: TCP
env:
- name: DATABASE_URL
valueFrom:
Expand All @@ -36,6 +40,10 @@ spec:
- name: {{ $k }}
value: {{ $v | quote }}
{{- end }}
livenessProbe:
{{- toYaml .Values.indexer.livenessProbe | nindent 12 }}
readinessProbe:
{{- toYaml .Values.indexer.readinessProbe | nindent 12 }}
resources:
{{- toYaml .Values.indexer.resources | nindent 12 }}
{{- with .Values.indexer.nodeSelector }}
Expand Down
4 changes: 4 additions & 0 deletions helm/trident/templates/nginx-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ spec:
- name: nginx-config
mountPath: /etc/nginx/nginx.conf
subPath: nginx.conf
livenessProbe:
{{- toYaml .Values.nginx.livenessProbe | nindent 12 }}
readinessProbe:
{{- toYaml .Values.nginx.readinessProbe | nindent 12 }}
resources:
{{- toYaml .Values.nginx.resources | nindent 12 }}
volumes:
Expand Down
47 changes: 47 additions & 0 deletions helm/trident/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,25 @@ indexer:
env:
# GRPC_ADDR of the Rust gRPC service (in-cluster DNS)
GRPC_ADDR: "trident-grpc-api:5000"
# Prometheus metrics server (METRICS_PORT, default 9090) doubles as the
# liveness/readiness signal for this otherwise portless worker.
metricsPort: 9090
livenessProbe:
httpGet:
path: /metrics
port: 9090
initialDelaySeconds: 15
periodSeconds: 20
failureThreshold: 3
timeoutSeconds: 2
readinessProbe:
httpGet:
path: /metrics
port: 9090
initialDelaySeconds: 10
periodSeconds: 10
failureThreshold: 3
timeoutSeconds: 2
nodeSelector: {}
tolerations: []
affinity: {}
Expand All @@ -43,6 +62,20 @@ grpcApi:
replicaCount: 1
service:
port: 5000
livenessProbe:
tcpSocket:
port: 5000
initialDelaySeconds: 10
periodSeconds: 10
failureThreshold: 3
timeoutSeconds: 2
readinessProbe:
tcpSocket:
port: 5000
initialDelaySeconds: 5
periodSeconds: 5
failureThreshold: 3
timeoutSeconds: 2
resources:
requests:
cpu: "250m"
Expand Down Expand Up @@ -112,6 +145,20 @@ nginx:
service:
type: LoadBalancer
port: 80
livenessProbe:
tcpSocket:
port: 80
initialDelaySeconds: 5
periodSeconds: 10
failureThreshold: 3
timeoutSeconds: 2
readinessProbe:
tcpSocket:
port: 80
initialDelaySeconds: 5
periodSeconds: 10
failureThreshold: 3
timeoutSeconds: 2
resources:
requests:
cpu: "50m"
Expand Down
Loading