Skip to content
Open
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.11
digest: sha256:cf6d4495e3c0e0c7e88cbbdf2564d5c61eff190b5601e18934432e41013bcca5
generated: "2026-07-16T13:38:43.259976-05:00"
- name: nebari-app
repository: oci://quay.io/reiemp/charts
version: 0.1.3
digest: sha256:4c9732b7205a3f5077047412c6c388d4aa66d4552ee4836d92cb7ff407ded73d
generated: "2026-08-31T17:04:25.070075068+02:00"
7 changes: 5 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"
keywords:
- nebari
home: https://github.com/nebari-dev/nebari-chat-pack
Expand All @@ -17,3 +17,6 @@ dependencies:
- name: ravnar
repository: oci://quay.io/nebari/charts
version: "0.0.11"
- name: nebari-app
repository: oci://quay.io/reiemp/charts
version: "0.1.3"
119 changes: 0 additions & 119 deletions helm/nebari-chat/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -1,122 +1,3 @@
{{/*
NebariApp helper template.
Expects a dict with keys: top, component, service, 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 }}
Comment on lines -19 to -24

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.

This meant that the service was not user configurable before and while dynamically computed as part of the template was fixed by the chart. This can be seen in the custom services diff in this comment. With this PR the dynamic default stays, but user override is now possible.

{{- 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 }}
{{- end -}}

{{/*
Construct a JSON representation of the ravnar subchart context.
Useful for evaluating ravnar templates that depend on subchart scope.
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.

35 changes: 35 additions & 0 deletions helm/nebari-chat/templates/nebariapp.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{{- define "nebari-chat.nebariapp" -}}
{{- $top := .top -}}
{{- $component := .component -}}
{{- $spec := .spec -}}
{{- 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
"tplCtx" $top
) -}}
{{- end -}}
apiVersion: v1
kind: Namespace
metadata:
name: {{ .Release.Namespace }}
labels:
nebari.dev/managed: "true"
{{- include "ravnar.labels" (dict "top" . "component" "nebariapp") | nindent 4 }}
---
{{ include "nebari-chat.nebariapp" (dict
"top" .
"component" "backend"
"spec" .Values.backend.nebariapp
) }}
---
{{ if .Values.frontend.enabled }}
{{- include "nebari-chat.nebariapp" (dict
"top" .
"component" "frontend"
"spec" .Values.frontend.nebariapp
) }}
{{- end }}
Loading
Loading