multi tenant in helm chart

Author: vcarluer

api/kubernetes/helm-chart/templates/_helpers.tpl

@@ -79,11 +79,20 @@ Create Docker secrets so Argo Workflows can pull images from a private container
 {{/*
 Default Ingress path
 */}}
+{{- define "cosmotech-api.ingressTenantPath" -}}
+{{- if .Values.api.multiTenant }}
+{{- printf "%s/%s/" (printf "%s" .Values.api.servletContextPath | trimSuffix "/" ) .Release.Namespace }}
+{{- else }}
+{{- printf "%s/" (printf "%s" .Values.api.servletContextPath | trimSuffix "/" ) }}
+{{- end }}
+{{- end }}
+
+{{/*
 {{- define "cosmotech-api.apiBasePath" -}}
 {{- if eq .Values.api.version "latest" }}
-{{- printf "%s/" (printf "%s" .Values.api.servletContextPath | trimSuffix "/" ) }}
+{{- printf "%s/" (include "cosmotech-api.ingressTenantPath" . | trimSuffix "/" ) }}
 {{- else }}
-{{- printf "%s/%s/" (printf "%s" .Values.api.servletContextPath | trimSuffix "/" ) (printf "%s" .Values.api.version | trimSuffix "/" ) }}
+{{- printf "%s/%s/" (include "cosmotech-api.ingressTenantPath" . | trimSuffix "/" ) (printf "%s" .Values.api.version | trimSuffix "/" ) }}
 {{- end }}
 {{- end }}
 

api/kubernetes/helm-chart/values.yaml

@@ -84,6 +84,8 @@ api:
   servletContextPath: /
   # Examples: latest, v1, v2
   version: latest
+  # Whether or not the API is multi-tenant and should expose the tenant in the URL
+  multiTenant: false
   # Configure probes failure thresholds to higher values if you are in debug mode to avoid pod restart
   probes:
     startup: