From 8ef2cc9a375a453b9bd6713c0f345f8c4448f414 Mon Sep 17 00:00:00 2001 From: Sabrina Demagny Date: Fri, 4 Apr 2025 14:59:38 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B1(helm)=20add=20la-suite=20ingress?= =?UTF-8?q?=20path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The route was added but not declared in the ingress. --- CHANGELOG.md | 1 + src/backend/people/settings.py | 1 + src/helm/desk/Chart.yaml | 2 +- src/helm/desk/templates/ingress.yaml | 28 ++++++++++++++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 447f74f..b537cbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to ### Added +- 🧱(helm) add la-suite ingress path - ➕(backend) add django-lasuite dependency #858 - ✨(plugins) add endpoint to list siret of active organizations #771 - ✨(core) create AccountServiceAuthentication backend #771 diff --git a/src/backend/people/settings.py b/src/backend/people/settings.py index 38d49f1..4670a03 100755 --- a/src/backend/people/settings.py +++ b/src/backend/people/settings.py @@ -222,6 +222,7 @@ class Base(Configuration): environ_name="INSTALLED_PLUGINS", environ_prefix=None, ) + INSTALLED_APPS = [ # People "admin.apps.PeopleAdminConfig", # replaces 'django.contrib.admin' diff --git a/src/helm/desk/Chart.yaml b/src/helm/desk/Chart.yaml index 8b9451e..bee2e29 100644 --- a/src/helm/desk/Chart.yaml +++ b/src/helm/desk/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 type: application name: desk -version: 0.0.6 +version: 0.0.7 diff --git a/src/helm/desk/templates/ingress.yaml b/src/helm/desk/templates/ingress.yaml index c43489c..5826d33 100644 --- a/src/helm/desk/templates/ingress.yaml +++ b/src/helm/desk/templates/ingress.yaml @@ -102,6 +102,20 @@ spec: serviceName: {{ include "desk.backend.fullname" $ }} servicePort: {{ $.Values.backend.service.port }} {{- end }} + - path: /la-suite + {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} + pathType: Prefix + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ include "desk.backend.fullname" . }} + port: + number: {{ .Values.backend.service.port }} + {{- else }} + serviceName: {{ include "desk.backend.fullname" . }} + servicePort: {{ .Values.backend.service.port }} + {{- end }} {{- with .Values.ingress.customBackends }} {{- toYaml . | nindent 10 }} {{- end }} @@ -166,6 +180,20 @@ spec: serviceName: {{ include "desk.backend.fullname" $ }} servicePort: {{ $.Values.backend.service.port }} {{- end }} + - path: /la-suite + {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} + pathType: Prefix + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ include "desk.backend.fullname" $ }} + port: + number: {{ $.Values.backend.service.port }} + {{- else }} + serviceName: {{ include "desk.backend.fullname" $ }} + servicePort: {{ $.Values.backend.service.port }} + {{- end }} {{- with $.Values.ingress.customBackends }} {{- toYaml . | nindent 10 }} {{- end }}