Skip to content
Draft
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
7 changes: 5 additions & 2 deletions helm/nebari-chat/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@ dependencies:
- name: ravnar
repository: oci://quay.io/nebari/charts
version: 0.0.10
digest: sha256:16e9b54afd12cde72ab68e652f10a7e2e87b3bc9f59e7f7f03676e2761607301
generated: "2026-06-17T09:00:17.172822057+02:00"
- name: nebari-app
repository: file://../../../nebari-operator/charts/nebari-app
version: 0.1.0
digest: sha256:0610b6475dddc0e46eac759504f05beb275db5dc9f41f4ff62179b6893420fa6
generated: "2026-07-02T14:49:59.075241316+02:00"
8 changes: 6 additions & 2 deletions helm/nebari-chat/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: nebari-chat
type: application
description: chat pack for nebari
version: "set-by-cd"
appVersion: "set-by-cd"
version: "0.0.0"
appVersion: "0.0.0"
Comment on lines +5 to +6

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert before merge

keywords:
- nebari
home: https://github.com/nebari-dev/nebari-chat-pack
Expand All @@ -17,3 +17,7 @@ dependencies:
- name: ravnar
repository: oci://quay.io/nebari/charts
version: "0.0.10"
- name: nebari-app
repository: file://../../../nebari-operator/charts/nebari-app
# repository: oci://quay.io/nebari/charts
Comment on lines +21 to +22

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use OCI before merge

version: "0.1.0"
120 changes: 9 additions & 111 deletions helm/nebari-chat/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,119 +2,17 @@
NebariApp helper template.
Expects a dict with keys: top, component, service, nebariapp
*/}}
{{- define "nebari-chat.nebariapp" -}}
{{- define "nebari-chat.nebariApp" -}}
{{- $top := .top -}}
{{- $component := .component -}}
{{- $service := .service -}}
{{- $nebariapp := .nebariapp -}}
apiVersion: reconcilers.nebari.dev/v1
kind: NebariApp
metadata:
name: {{ include "ravnar.component-name" (dict "top" $top "component" $component) }}
namespace: {{ $top.Release.Namespace }}
labels:
{{- include "ravnar.labels" (dict "top" $top "component" $component) | nindent 4 }}
spec:
hostname: {{ required (printf "%s.nebariapp.hostname is required" $component) $nebariapp.hostname }}
service:
name: {{ $service.name }}
port: {{ $service.port }}
{{- with $service.namespace }}
namespace: {{ . }}
{{- end }}
{{- with $nebariapp.serviceAccountName }}
serviceAccountName: {{ . }}
{{- end }}
{{- with $nebariapp.routing }}
routing:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with $nebariapp.auth }}
auth:
enabled: {{ .enabled }}
provider: {{ .provider }}
provisionClient: {{ .provisionClient }}
enforceAtGateway: {{ .enforceAtGateway }}
redirectURI: {{ .redirectURI }}
{{- with .clientSecretRef }}
clientSecretRef: {{ . }}
{{- end }}
{{- with .scopes }}
scopes:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .groups }}
groups:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .forwardAccessToken }}
forwardAccessToken: {{ . }}
{{- end }}
{{- with .denyRedirect }}
denyRedirect:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .issuerURL }}
issuerURL: {{ . }}
{{- end }}
{{- with .spaClient }}
spaClient:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .deviceFlowClient }}
deviceFlowClient:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .keycloakConfig }}
keycloakConfig:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .tokenExchange }}
tokenExchange:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- end }}
{{- with $nebariapp.gateway }}
gateway: {{ . }}
{{- end }}
{{- with .nebariapp.landingPage }}
landingPage:
enabled: {{ .enabled | default false }}
{{- with .displayName }}
displayName: {{ . | quote }}
{{- end }}
{{- with .description }}
description: {{ . | quote }}
{{- end }}
{{- with .icon }}
icon: {{ . | quote }}
{{- end }}
{{- with .category }}
category: {{ . | quote }}
{{- end }}
{{- if kindIs "float64" .priority }}
priority: {{ .priority }}
{{- end }}
{{- with .externalUrl }}
externalUrl: {{ . | quote }}
{{- end }}
{{- with .healthCheck }}
healthCheck:
enabled: {{ .enabled | default false }}
{{- with .path }}
path: {{ . | quote }}
{{- end }}
{{- if .intervalSeconds }}
intervalSeconds: {{ .intervalSeconds }}
{{- end }}
{{- if .timeoutSeconds }}
timeoutSeconds: {{ .timeoutSeconds }}
{{- end }}
{{- if .port }}
port: {{ .port }}
{{- end }}
{{- end }}
{{- end }}
{{- include "nebari-app.nebariApp" (dict
"metadata" (dict
"name" (include "ravnar.component-name" (dict "top" $top "component" $component))
"namespace" $top.Release.Namespace
"labels" (include "ravnar.labels" (dict "top" $top "component" $component) | fromYaml)
)
"spec" .spec
) -}}
{{- end -}}

{{/*
Expand Down
12 changes: 0 additions & 12 deletions helm/nebari-chat/templates/nebariapp-backend.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions helm/nebari-chat/templates/nebariapp-frontend.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions helm/nebari-chat/templates/nebariapp-namespace.yaml

This file was deleted.

34 changes: 34 additions & 0 deletions helm/nebari-chat/templates/nebariapp.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{{- $component := "nebariapp" }}
apiVersion: v1
kind: Namespace
metadata:
name: {{ .Release.Namespace }}
labels:
nebari.dev/managed: "true"
{{- include "ravnar.labels" (dict "top" . "component" $component) | nindent 4 }}
---
{{- $component := "backend" }}
{{- with include "nebari-chat.ravnarContextJson" . | fromJson }}
{{- include "nebari-chat.nebariApp" (dict
"top" $
"component" $component
"spec" (mergeOverwrite (dict
"service" (dict
"name" (include "ravnar.fullname" .)
"port" .Values.service.port
)
) $.Values.backend.nebariApp)
) }}
{{- end }}
---
{{- $component := "frontend" }}
{{- include "nebari-chat.nebariApp" (dict
"top" $
"component" $component
"spec" (mergeOverwrite (dict
"service" (dict
"name" (include "ravnar.component-name" (dict "top" . "component" $component))
"port" .Values.frontend.service.port
)
) .Values.frontend.nebariApp)
) }}
12 changes: 6 additions & 6 deletions helm/nebari-chat/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@
"backend": {
"type": "object",
"properties": {
"nebariapp": {
"$ref": "#/definitions/nebariapp"
"nebariApp": {
"$ref": "#/definitions/nebariApp"
}
},
"required": ["nebariapp"]
"required": ["nebariApp"]
},
"frontend": {
"type": "object",
Expand Down Expand Up @@ -185,14 +185,14 @@
}
}
},
"nebariapp": {
"$ref": "#/definitions/nebariapp"
"nebariApp": {
"$ref": "#/definitions/nebariApp"
}
}
}
},
"definitions": {
"nebariapp": {
"nebariApp": {
"type": "object",
"properties": {
"hostname": {
Expand Down
4 changes: 2 additions & 2 deletions helm/nebari-chat/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ravnar:
enabled: false

backend:
nebariapp:
nebariApp:
# -- The hostname for the backend NebariApp
hostname: ""
# -- Routing configuration for the backend NebariApp
Expand Down Expand Up @@ -107,7 +107,7 @@ frontend:
# -- The URL of the backend API. Auto-detected if not set
url: ""

nebariapp:
nebariApp:
# -- The hostname for the frontend NebariApp
hostname: ""
# -- Authentication configuration for the frontend NebariApp
Expand Down
Loading