github/sim
1
0
Fork 0
mirror of https://github.com/simstudioai/sim.git synced 2026-02-10 22:55:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

improvement(helm): support copilot-only deployments (#3185)

Browse Source
This commit is contained in:
Waleed
2026-02-10 17:03:11 -08:00
committed by GitHub
parent c5dd90e79d
commit f8e9614c9c
7 changed files with 96 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helm/sim/examples/values-copilot.yaml
View File

@@ -63,7 +63,7 @@ copilot:
image:
repository: postgres
tag: 16-alpine
tag: 17-alpine
pullPolicy: IfNotPresent
auth:

40
helm/sim/templates/ingress-internal.yaml
View File

@@ -1,4 +1,8 @@
{{- if .Values.ingressInternal.enabled }}
{{- $appActive := .Values.app.enabled -}}
{{- $realtimeActive := .Values.realtime.enabled -}}
{{- $hasCopilotIngress := and .Values.copilot.enabled .Values.ingressInternal.copilot -}}
{{- $realtimeHasOwnRule := and $realtimeActive (or (not $appActive) (ne .Values.ingressInternal.realtime.host .Values.ingressInternal.app.host)) -}}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
@@ -17,22 +21,32 @@ spec:
{{- if .Values.ingressInternal.tls.enabled }}
tls:
- hosts:
{{- if $appActive }}
- {{ .Values.ingressInternal.app.host | quote }}
{{- if and .Values.realtime.enabled (ne .Values.ingressInternal.realtime.host .Values.ingressInternal.app.host) }}
{{- end }}
{{- if $realtimeHasOwnRule }}
- {{ .Values.ingressInternal.realtime.host | quote }}
{{- end }}
{{- if and .Values.copilot.enabled .Values.ingressInternal.copilot }}
{{- if and (ne .Values.ingressInternal.copilot.host .Values.ingressInternal.app.host) (ne .Values.ingressInternal.copilot.host .Values.ingressInternal.realtime.host) }}
{{- if $hasCopilotIngress }}
{{- $copilotHostCovered := false }}
{{- if and $appActive (eq .Values.ingressInternal.copilot.host .Values.ingressInternal.app.host) }}
{{- $copilotHostCovered = true }}
{{- end }}
{{- if and $realtimeHasOwnRule (eq .Values.ingressInternal.copilot.host .Values.ingressInternal.realtime.host) }}
{{- $copilotHostCovered = true }}
{{- end }}
{{- if not $copilotHostCovered }}
- {{ .Values.ingressInternal.copilot.host | quote }}
{{- end }}
{{- end }}
secretName: {{ .Values.ingressInternal.tls.secretName }}
{{- end }}
rules:
{{- if $appActive }}
- host: {{ .Values.ingressInternal.app.host | quote }}
http:
paths:
{{- if and .Values.realtime.enabled (eq .Values.ingressInternal.realtime.host .Values.ingressInternal.app.host) }}
{{- if and $realtimeActive (eq .Values.ingressInternal.realtime.host .Values.ingressInternal.app.host) }}
{{- range .Values.ingressInternal.realtime.paths }}
- path: {{ .path }}
pathType: {{ .pathType }}
@@ -43,7 +57,7 @@ spec:
number: {{ $.Values.realtime.service.port }}
{{- end }}
{{- end }}
{{- if and .Values.copilot.enabled .Values.ingressInternal.copilot (eq .Values.ingressInternal.copilot.host .Values.ingressInternal.app.host) }}
{{- if and $hasCopilotIngress (eq .Values.ingressInternal.copilot.host .Values.ingressInternal.app.host) }}
{{- range .Values.ingressInternal.copilot.paths }}
- path: {{ .path }}
pathType: {{ .pathType }}
@@ -63,7 +77,8 @@ spec:
port:
number: {{ $.Values.app.service.port }}
{{- end }}
{{- if and .Values.realtime.enabled (ne .Values.ingressInternal.realtime.host .Values.ingressInternal.app.host) }}
{{- end }}
{{- if $realtimeHasOwnRule }}
- host: {{ .Values.ingressInternal.realtime.host | quote }}
http:
paths:
@@ -76,7 +91,7 @@ spec:
port:
number: {{ $.Values.realtime.service.port }}
{{- end }}
{{- if and .Values.copilot.enabled .Values.ingressInternal.copilot (eq .Values.ingressInternal.copilot.host .Values.ingressInternal.realtime.host) }}
{{- if and $hasCopilotIngress (eq .Values.ingressInternal.copilot.host .Values.ingressInternal.realtime.host) }}
{{- range .Values.ingressInternal.copilot.paths }}
- path: {{ .path }}
pathType: {{ .pathType }}
@@ -88,7 +103,15 @@ spec:
{{- end }}
{{- end }}
{{- end }}
{{- if and .Values.copilot.enabled .Values.ingressInternal.copilot (and (ne .Values.ingressInternal.copilot.host .Values.ingressInternal.app.host) (ne .Values.ingressInternal.copilot.host .Values.ingressInternal.realtime.host)) }}
{{- if $hasCopilotIngress }}
{{- $copilotServed := false }}
{{- if and $appActive (eq .Values.ingressInternal.copilot.host .Values.ingressInternal.app.host) }}
{{- $copilotServed = true }}
{{- end }}
{{- if and $realtimeHasOwnRule (eq .Values.ingressInternal.copilot.host .Values.ingressInternal.realtime.host) }}
{{- $copilotServed = true }}
{{- end }}
{{- if not $copilotServed }}
- host: {{ .Values.ingressInternal.copilot.host | quote }}
http:
paths:
@@ -101,5 +124,6 @@ spec:
port:
number: {{ $.Values.copilot.server.service.port }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

40
helm/sim/templates/ingress.yaml
View File

@@ -1,4 +1,8 @@
{{- if .Values.ingress.enabled }}
{{- $appActive := .Values.app.enabled -}}
{{- $realtimeActive := .Values.realtime.enabled -}}
{{- $hasCopilotIngress := and .Values.copilot.enabled .Values.ingress.copilot -}}
{{- $realtimeHasOwnRule := and $realtimeActive (or (not $appActive) (ne .Values.ingress.realtime.host .Values.ingress.app.host)) -}}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
@@ -17,22 +21,32 @@ spec:
{{- if .Values.ingress.tls.enabled }}
tls:
- hosts:
{{- if $appActive }}
- {{ .Values.ingress.app.host | quote }}
{{- if and .Values.realtime.enabled (ne .Values.ingress.realtime.host .Values.ingress.app.host) }}
{{- end }}
{{- if $realtimeHasOwnRule }}
- {{ .Values.ingress.realtime.host | quote }}
{{- end }}
{{- if and .Values.copilot.enabled .Values.ingress.copilot }}
{{- if and (ne .Values.ingress.copilot.host .Values.ingress.app.host) (ne .Values.ingress.copilot.host .Values.ingress.realtime.host) }}
{{- if $hasCopilotIngress }}
{{- $copilotHostCovered := false }}
{{- if and $appActive (eq .Values.ingress.copilot.host .Values.ingress.app.host) }}
{{- $copilotHostCovered = true }}
{{- end }}
{{- if and $realtimeHasOwnRule (eq .Values.ingress.copilot.host .Values.ingress.realtime.host) }}
{{- $copilotHostCovered = true }}
{{- end }}
{{- if not $copilotHostCovered }}
- {{ .Values.ingress.copilot.host | quote }}
{{- end }}
{{- end }}
secretName: {{ .Values.ingress.tls.secretName }}
{{- end }}
rules:
{{- if $appActive }}
- host: {{ .Values.ingress.app.host | quote }}
http:
paths:
{{- if and .Values.realtime.enabled (eq .Values.ingress.realtime.host .Values.ingress.app.host) }}
{{- if and $realtimeActive (eq .Values.ingress.realtime.host .Values.ingress.app.host) }}
{{- range .Values.ingress.realtime.paths }}
- path: {{ .path }}
pathType: {{ .pathType }}
@@ -43,7 +57,7 @@ spec:
number: {{ $.Values.realtime.service.port }}
{{- end }}
{{- end }}
{{- if and .Values.copilot.enabled .Values.ingress.copilot (eq .Values.ingress.copilot.host .Values.ingress.app.host) }}
{{- if and $hasCopilotIngress (eq .Values.ingress.copilot.host .Values.ingress.app.host) }}
{{- range .Values.ingress.copilot.paths }}
- path: {{ .path }}
pathType: {{ .pathType }}
@@ -63,7 +77,8 @@ spec:
port:
number: {{ $.Values.app.service.port }}
{{- end }}
{{- if and .Values.realtime.enabled (ne .Values.ingress.realtime.host .Values.ingress.app.host) }}
{{- end }}
{{- if $realtimeHasOwnRule }}
- host: {{ .Values.ingress.realtime.host | quote }}
http:
paths:
@@ -76,7 +91,7 @@ spec:
port:
number: {{ $.Values.realtime.service.port }}
{{- end }}
{{- if and .Values.copilot.enabled .Values.ingress.copilot (eq .Values.ingress.copilot.host .Values.ingress.realtime.host) }}
{{- if and $hasCopilotIngress (eq .Values.ingress.copilot.host .Values.ingress.realtime.host) }}
{{- range .Values.ingress.copilot.paths }}
- path: {{ .path }}
pathType: {{ .pathType }}
@@ -88,7 +103,15 @@ spec:
{{- end }}
{{- end }}
{{- end }}
{{- if and .Values.copilot.enabled .Values.ingress.copilot (and (ne .Values.ingress.copilot.host .Values.ingress.app.host) (ne .Values.ingress.copilot.host .Values.ingress.realtime.host)) }}
{{- if $hasCopilotIngress }}
{{- $copilotServed := false }}
{{- if and $appActive (eq .Values.ingress.copilot.host .Values.ingress.app.host) }}
{{- $copilotServed = true }}
{{- end }}
{{- if and $realtimeHasOwnRule (eq .Values.ingress.copilot.host .Values.ingress.realtime.host) }}
{{- $copilotServed = true }}
{{- end }}
{{- if not $copilotServed }}
- host: {{ .Values.ingress.copilot.host | quote }}
http:
paths:
@@ -101,5 +124,6 @@ spec:
port:
number: {{ $.Values.copilot.server.service.port }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

2
helm/sim/templates/job-copilot-migrations.yaml
View File

@@ -36,7 +36,7 @@ spec:
{{- if .Values.copilot.postgresql.enabled }}
initContainers:
- name: wait-for-postgres
image: postgres:16-alpine
image: {{ include "sim.image" (dict "context" . "image" .Values.copilot.postgresql.image) }}
command:
- /bin/sh
- -c

3
helm/sim/templates/statefulset-copilot-postgres.yaml
View File

@@ -80,6 +80,9 @@ spec:
- name: postgresql
containerPort: {{ .Values.copilot.postgresql.service.targetPort }}
protocol: TCP
env:
- name: PGDATA
value: /var/lib/postgresql/data/pgdata
envFrom:
- secretRef:
name: {{ include "sim.fullname" . }}-copilot-postgresql-secret

26
helm/sim/values.schema.json
View File

@@ -1008,7 +1008,31 @@
}
}
}
}
},
"anyOf": [
{
"properties": {
"app": {
"properties": {
"enabled": {
"const": true
}
}
}
}
},
{
"properties": {
"realtime": {
"properties": {
"enabled": {
"const": true
}
}
}
}
}
]
},
"then": {
"properties": {

4
helm/sim/values.yaml
View File

@@ -1073,11 +1073,11 @@ copilot:
postgresql:
# Enable/disable internal PostgreSQL for copilot
enabled: true
# Image configuration
image:
repository: postgres
tag: 16-alpine
tag: 17-alpine
pullPolicy: IfNotPresent
# Authentication configuration