Skip to content

Commit 55dc86d

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/backup-with-pg-dump
1 parent 6aeee17 commit 55dc86d

File tree

80 files changed

+4275
-1325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+4275
-1325
lines changed

.github/workflows/release-helm-charts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ jobs:
6565
done
6666
6767
- name: Configure Git
68-
if: github.ref == 'refs/heads/main'
68+
if: github.ref == 'refs/heads/feat/main'
6969
run: |
7070
git config user.name "github-actions[bot]"
7171
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
7272
7373
- name: Run chart-releaser
74-
if: github.ref == 'refs/heads/main'
74+
if: github.ref == 'refs/heads/feat/main'
7575
uses: helm/chart-releaser-action@v1.6.0
7676
with:
7777
charts_dir: charts

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ go.work.sum
2828
.env
2929
charts/*/charts/
3030
*/*/values.schema.json
31-
**/secret.yaml
31+
# **/secret.yaml
3232

3333

3434
# Editor/IDE
3535
# .idea/
3636
# .vscode/
3737

38-
*/*/.cr-release-packages
38+
*/*/.cr-release-packages
39+
40+
.idea
11.6 KB
Loading
2.47 KB
Loading
Lines changed: 10 additions & 0 deletions
Loading

charts/ai-models/Chart.lock

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
dependencies:
2+
- name: common
3+
repository: https://charts.bitnami.com/bitnami
4+
version: 2.36.0
5+
digest: sha256:01cb74861881e75c139726040c552af1d2deb18b7ac56f57c5ea81548cf38d2e
6+
generated: "2026-03-01T23:58:09.771135+01:00"

charts/ai-models/Chart.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: v2
2+
name: models
3+
description: AI model backends and routing configuration chart - deploys Backend, AIServiceBackend, AIGatewayRoute, and security policies
4+
type: application
5+
version: 1.0.0
6+
appVersion: "1.0.0"
7+
8+
9+
dependencies:
10+
- name: common
11+
version: '*'
12+
repository: https://charts.bitnami.com/bitnami
13+
tags:
14+
- common
15+
- bitnami-common
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{{- range $routeName, $routeConfig := .Values.models }}
2+
{{- if (default true $routeConfig.enabled) }}
3+
{{/* Filter and Validate Backends */}}
4+
{{- $activeBackends := dict -}}
5+
{{- range $bKey, $bVal := $routeConfig.backends }}
6+
{{- if (default true $bVal.enabled) }}
7+
{{- $_ := set $activeBackends $bKey $bVal -}}
8+
{{- end }}
9+
{{- end }}
10+
11+
{{- if lt (len $activeBackends) 2 }}
12+
{{- fail (printf "Route '%s' must have at least 2 enabled backends. Found: %d" $routeName (len $activeBackends)) }}
13+
{{- end }}
14+
15+
---
16+
apiVersion: aigateway.envoyproxy.io/v1alpha1
17+
kind: AIGatewayRoute
18+
metadata:
19+
name: {{ $routeName }}
20+
spec:
21+
parentRefs:
22+
- group: gateway.networking.k8s.io
23+
kind: Gateway
24+
name: {{ $.Values.gatewayRef.name }}
25+
namespace: converse-gateway
26+
llmRequestCosts:
27+
- metadataKey: prompt_tokens
28+
type: InputToken
29+
- metadataKey: completion_tokens
30+
type: OutputToken
31+
- metadataKey: llm_total_token
32+
type: TotalToken
33+
rules:
34+
- matches:
35+
- headers:
36+
- type: Exact
37+
name: x-ai-eg-model
38+
value: {{ $routeConfig.modelMatch | default $routeName }}
39+
modelsOwnedBy: GIS AI Models
40+
backendRefs:
41+
{{- range $bKey, $bVal := $activeBackends }}
42+
{{- $backendBase := index $.Values.backends $bVal.ref }}
43+
- name: {{ $backendBase.resourceName }}
44+
{{- if $bVal.modelNameOverride }}
45+
modelNameOverride: {{ $bVal.modelNameOverride }}
46+
{{- end }}
47+
weight: {{ $bVal.weight | default 1 }}
48+
priority: {{ $bVal.priority | default 0 }}
49+
{{- end }}
50+
{{- end }}
51+
{{- end }}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{{- range $backendName, $backendConfig := .Values.backends }}
2+
{{- if not (eq $backendConfig.enabled false) }}
3+
---
4+
apiVersion: aigateway.envoyproxy.io/v1alpha1
5+
kind: AIServiceBackend
6+
metadata:
7+
name: {{ $backendConfig.resourceName }}
8+
spec:
9+
schema:
10+
name: {{ $backendConfig.schema }}
11+
{{- if $backendConfig.prefix }}
12+
prefix: {{ $backendConfig.prefix }}
13+
{{- end }}
14+
backendRef:
15+
name: {{ $backendConfig.resourceName }}
16+
kind: Backend
17+
group: gateway.envoyproxy.io
18+
{{- end }}
19+
{{- end }}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{{- range $backendName, $backendConfig := .Values.backends }}
2+
{{- if not (eq $backendConfig.enabled false) }}
3+
---
4+
apiVersion: gateway.envoyproxy.io/v1alpha1
5+
kind: Backend
6+
metadata:
7+
name: {{ $backendConfig.resourceName }}
8+
spec:
9+
endpoints:
10+
- fqdn:
11+
hostname: {{ $backendConfig.fqdn.hostname }}
12+
port: {{ $backendConfig.fqdn.port }}
13+
{{- end }}
14+
{{- end }}

0 commit comments

Comments
 (0)