From e71bfd68cd954cde3c7e4ec9d1f8123d3ab160fe Mon Sep 17 00:00:00 2001
From: Guillaume Leroy <pro.guillaume.leroy@gmail.com>
Date: Wed, 17 Jul 2024 18:15:17 +0200
Subject: [PATCH] chore(chart/simpaas): expose api on /api (#16)

---
 charts/simpaas/templates/api/deployment.yaml | 2 ++
 charts/simpaas/values.yaml                   | 9 ++++-----
 config/local.yaml                            | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/charts/simpaas/templates/api/deployment.yaml b/charts/simpaas/templates/api/deployment.yaml
index 46315e6..b84d278 100644
--- a/charts/simpaas/templates/api/deployment.yaml
+++ b/charts/simpaas/templates/api/deployment.yaml
@@ -65,6 +65,8 @@ spec:
             secretKeyRef:
               name: {{ include "simpaas.api.jwtSecretName" . }}
               key: {{ .Values.api.jwtSecret.key }}
+        - name: ROOT_PATH
+          value: {{ .Values.api.ingress.path }}
         {{- include "simpaas.env" (dict "Values" .Values "Service" .Values.api) | nindent 8 }}
         {{- with $env }}
         {{- toYaml . | nindent 8 }}
diff --git a/charts/simpaas/values.yaml b/charts/simpaas/values.yaml
index 1f3570c..c5cc7c2 100644
--- a/charts/simpaas/values.yaml
+++ b/charts/simpaas/values.yaml
@@ -75,11 +75,11 @@ api:
 
   livenessProbe:
     httpGet:
-      path: /_health
+      path: /api/_health
       port: http
   readinessProbe:
     httpGet:
-      path: /_health
+      path: /api/_health
       port: http
 
   jwtSecret:
@@ -94,7 +94,7 @@ api:
     domain: ~
     fqdn: ~
     tls: false
-    path: /api/(.*)
+    path: /api
     pathType: ImplementationSpecific
 
   roleAdmin:
@@ -184,8 +184,7 @@ ingress:
   className: ~
   domain: ~
   tlsSecretName: ~
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /$1
+  annotations: {}
 
 cert-manager:
   clusterIssuers: []
diff --git a/config/local.yaml b/config/local.yaml
index 4281855..63ffe55 100644
--- a/config/local.yaml
+++ b/config/local.yaml
@@ -6,7 +6,7 @@ common:
   logFilter: simpaas=debug,warn
 
 api:
-  replicas: 0
+  replicas: 1
 
 op:
   replicas: 0