From 1c9e561266f809513acb9846c23b794377680ca6 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 5 Mar 2025 17:51:14 -0800 Subject: [PATCH] Update Klat memory requests to reflect real world usage Update Neon memory requests to minimal requirements when external STT/TTS services are used Update Neon skills memory requests to include some margin for initialization which commonly fails with OOM in current deployments --- neon_diana_utils/helm_charts/klat/klat-chat/Chart.yaml | 2 +- .../helm_charts/klat/klat-chat/templates/ingress.yaml | 4 ++++ neon_diana_utils/helm_charts/klat/klat-chat/values.yaml | 5 +++-- neon_diana_utils/helm_charts/neon/core/Chart.yaml | 8 ++++---- neon_diana_utils/helm_charts/neon/neon-audio/Chart.yaml | 2 +- neon_diana_utils/helm_charts/neon/neon-audio/values.yaml | 2 +- neon_diana_utils/helm_charts/neon/neon-skills/Chart.yaml | 2 +- neon_diana_utils/helm_charts/neon/neon-skills/values.yaml | 2 +- neon_diana_utils/helm_charts/neon/neon-speech/Chart.yaml | 2 +- neon_diana_utils/helm_charts/neon/neon-speech/values.yaml | 2 +- 10 files changed, 18 insertions(+), 13 deletions(-) diff --git a/neon_diana_utils/helm_charts/klat/klat-chat/Chart.yaml b/neon_diana_utils/helm_charts/klat/klat-chat/Chart.yaml index 4beb4d40..7e1d8ccf 100644 --- a/neon_diana_utils/helm_charts/klat/klat-chat/Chart.yaml +++ b/neon_diana_utils/helm_charts/klat/klat-chat/Chart.yaml @@ -3,5 +3,5 @@ name: klat-chat description: Deploy Klat Services type: application -version: 0.0.8 +version: 0.0.9 appVersion: "1.0.1a31" diff --git a/neon_diana_utils/helm_charts/klat/klat-chat/templates/ingress.yaml b/neon_diana_utils/helm_charts/klat/klat-chat/templates/ingress.yaml index a8e64c1d..7dc030af 100644 --- a/neon_diana_utils/helm_charts/klat/klat-chat/templates/ingress.yaml +++ b/neon_diana_utils/helm_charts/klat/klat-chat/templates/ingress.yaml @@ -14,6 +14,7 @@ metadata: kubernetes.io/ingress.class: {{ .Values.ingress.ingressClassName }} cert-manager.io/issuer: {{ .Values.ingress.certIssuer }} nginx.ingress.kubernetes.io/from-to-www-redirect: "true" + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" spec: tls: - secretName: {{ .Values.ingress.tlsSecretName }} @@ -27,6 +28,9 @@ spec: - {{ printf "%s.%s " .host $.Values.domain }} {{- end }} {{- end }} + {{- if .Values.redirectRoot}} + - {{ $.Values.domain }} + {{- end }} rules: {{- range .Values.ingress.rules }} diff --git a/neon_diana_utils/helm_charts/klat/klat-chat/values.yaml b/neon_diana_utils/helm_charts/klat/klat-chat/values.yaml index 296cd06f..c6cbcd76 100644 --- a/neon_diana_utils/helm_charts/klat/klat-chat/values.yaml +++ b/neon_diana_utils/helm_charts/klat/klat-chat/values.yaml @@ -16,14 +16,14 @@ images: image: ghcr.io/neongeckocom/chat_server name: klat-chat-server observer: - image: ghcr.io/neongeckocom/klatchat_observer + image: ghcr.io/neongeckocom/klatchat-observer name: klat-chat-observer admin: image: ghcr.io/neongeckocom/pyklatchat_admin name: klat-chat-admin resources: requests: - memory: "1500Mi" + memory: "500Mi" cpu: "0.01" ingress: @@ -31,6 +31,7 @@ ingress: ingressClassName: nginx tlsSecretName: tls-letsencrypt-klat certIssuer: letsencrypt-private-key + redirectRoot: False rules: - host: klat serviceName: klat-chat-client diff --git a/neon_diana_utils/helm_charts/neon/core/Chart.yaml b/neon_diana_utils/helm_charts/neon/core/Chart.yaml index dd1dc68e..9a41803f 100644 --- a/neon_diana_utils/helm_charts/neon/core/Chart.yaml +++ b/neon_diana_utils/helm_charts/neon/core/Chart.yaml @@ -3,7 +3,7 @@ name: neon-core description: Deploy Neon Core Services type: application -version: 0.0.9 +version: 0.0.10 appVersion: "1.0.1a31" dependencies: - name: neon-messagebus @@ -12,15 +12,15 @@ dependencies: repository: file://../neon-messagebus - name: neon-speech alias: neon-speech - version: 0.0.6 + version: 0.0.7 repository: file://../neon-speech - name: neon-skills alias: neon-skills - version: 0.0.7 + version: 0.0.8 repository: file://../neon-skills - name: neon-audio alias: neon-audio - version: 0.0.7 + version: 0.0.8 repository: file://../neon-audio - name: neon-enclosure alias: neon-enclosure diff --git a/neon_diana_utils/helm_charts/neon/neon-audio/Chart.yaml b/neon_diana_utils/helm_charts/neon/neon-audio/Chart.yaml index e7b60d78..7aba430e 100644 --- a/neon_diana_utils/helm_charts/neon/neon-audio/Chart.yaml +++ b/neon_diana_utils/helm_charts/neon/neon-audio/Chart.yaml @@ -3,7 +3,7 @@ name: neon-audio description: Deploy Neon Core Audio Service type: application -version: 0.0.7 +version: 0.0.8 appVersion: "1.0.1a31" dependencies: diff --git a/neon_diana_utils/helm_charts/neon/neon-audio/values.yaml b/neon_diana_utils/helm_charts/neon/neon-audio/values.yaml index 048316ab..0dc80d07 100644 --- a/neon_diana_utils/helm_charts/neon/neon-audio/values.yaml +++ b/neon_diana_utils/helm_charts/neon/neon-audio/values.yaml @@ -7,5 +7,5 @@ image: tag: dev resources: requests: - memory: "500Mi" + memory: "300Mi" cpu: "0.1" diff --git a/neon_diana_utils/helm_charts/neon/neon-skills/Chart.yaml b/neon_diana_utils/helm_charts/neon/neon-skills/Chart.yaml index 7daff58d..e3b9f160 100644 --- a/neon_diana_utils/helm_charts/neon/neon-skills/Chart.yaml +++ b/neon_diana_utils/helm_charts/neon/neon-skills/Chart.yaml @@ -3,7 +3,7 @@ name: neon-skills description: Deploy Neon Core Skills Service type: application -version: 0.0.7 +version: 0.0.8 appVersion: "1.0.1a31" dependencies: diff --git a/neon_diana_utils/helm_charts/neon/neon-skills/values.yaml b/neon_diana_utils/helm_charts/neon/neon-skills/values.yaml index 08526169..cc963113 100644 --- a/neon_diana_utils/helm_charts/neon/neon-skills/values.yaml +++ b/neon_diana_utils/helm_charts/neon/neon-skills/values.yaml @@ -7,5 +7,5 @@ image: tag: dev resources: requests: - memory: "800Mi" + memory: "850Mi" cpu: "0.1" \ No newline at end of file diff --git a/neon_diana_utils/helm_charts/neon/neon-speech/Chart.yaml b/neon_diana_utils/helm_charts/neon/neon-speech/Chart.yaml index 3c938971..f5d20df1 100644 --- a/neon_diana_utils/helm_charts/neon/neon-speech/Chart.yaml +++ b/neon_diana_utils/helm_charts/neon/neon-speech/Chart.yaml @@ -3,7 +3,7 @@ name: neon-speech description: Deploy Neon Core Speech (Voice) Service type: application -version: 0.0.6 +version: 0.0.7 appVersion: "1.0.1a31" dependencies: diff --git a/neon_diana_utils/helm_charts/neon/neon-speech/values.yaml b/neon_diana_utils/helm_charts/neon/neon-speech/values.yaml index db85a06f..fb91bba4 100644 --- a/neon_diana_utils/helm_charts/neon/neon-speech/values.yaml +++ b/neon_diana_utils/helm_charts/neon/neon-speech/values.yaml @@ -7,5 +7,5 @@ image: tag: dev resources: requests: - memory: "1Gi" + memory: "500Mi" cpu: "0.1" \ No newline at end of file