feat(teleport): Add a helper template to construct the namespace for …

…a component (#151)
SwanseaUniversityMedical · Nov 14, 2023 · 76f162b · 76f162b
1 parent 9e7e5e4
commit 76f162b
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 14 deletions.
diff --git a/charts/teleport/templates/_helpers.tpl b/charts/teleport/templates/_helpers.tpl
@@ -0,0 +1,9 @@
+{{/*
+Helper template which constructs the namespace for a given component.
+Concatenating the global.namespacePrefix and the app's namespace value,
+truncating the result and ensuring leading and trailing hyphens are trimmed.
+EXAMPLE USAGE: {{- include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appTrino.namespace) -}}
+*/}}
+{{- define "teleport.namespace"  -}}
+{{- (printf "%s-%s" (default "" .Values.global.namespacePrefix | trunc 63 | trimAll "-") (default "" .namespace | trunc 63 | trimAll "-")) | trunc 63 | trimAll "-" -}}
+{{- end -}}
diff --git a/charts/teleport/templates/application/app-airflow.yaml b/charts/teleport/templates/application/app-airflow.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appAirflow.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appAirflow.namespace) }}
     server: {{ eq .Values.appAirflow.cluster "" | ternary .Values.global.application.address .Values.appAirflow.cluster }}
   project: {{ .Values.global.application.argocd.project }}
   syncPolicy:

diff --git a/charts/teleport/templates/application/app-guacamole.yaml b/charts/teleport/templates/application/app-guacamole.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appGuacamole.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appGuacamole.namespace) }}
     server: {{ eq .Values.appGuacamole.cluster "" | ternary .Values.global.application.address .Values.appGuacamole.cluster }}
   project: {{ .Values.global.application.argocd.project }}
   syncPolicy:

diff --git a/charts/teleport/templates/application/app-hive.yaml b/charts/teleport/templates/application/app-hive.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appHive.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appHive.namespace) }}
     server: {{ eq .Values.appHive.cluster "" | ternary .Values.global.application.address .Values.appHive.cluster }}
   project: {{ .Values.global.application.argocd.project }}
   syncPolicy:

diff --git a/charts/teleport/templates/application/app-jupyter.yaml b/charts/teleport/templates/application/app-jupyter.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appJupyter.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appJupyter.namespace) }}
     server: {{ eq .Values.appJupyter.cluster "" | ternary .Values.global.application.address .Values.appJupyter.cluster }}
   project: {{ .Values.global.application.argocd.project }}
   syncPolicy:

diff --git a/charts/teleport/templates/application/app-keycloak.yaml b/charts/teleport/templates/application/app-keycloak.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appKeycloak.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appKeycloak.namespace) }}
     server: {{ eq .Values.appKeycloak.cluster "" | ternary .Values.global.application.address .Values.appKeycloak.cluster }}
   project: {{ .Values.global.application.argocd.project }}
   syncPolicy:

diff --git a/charts/teleport/templates/application/app-miniotenant.yaml b/charts/teleport/templates/application/app-miniotenant.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appMinioTenant.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appMinioTenant.namespace) }}
     server: {{ eq .Values.appMinioTenant.cluster "" | ternary .Values.global.application.address .Values.appMinioTenant.cluster }}
   project: {{ .Values.global.application.argocd.project }}
   syncPolicy:

diff --git a/charts/teleport/templates/application/app-rabbitmq.yaml b/charts/teleport/templates/application/app-rabbitmq.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appRabbitMQ.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appRabbitMQ.namespace) }}
     server: {{ eq .Values.appRabbitMQ.cluster "" | ternary .Values.global.application.address .Values.appRabbitMQ.cluster }}
   project: {{ .Values.global.application.argocd.project }}
   syncPolicy:

diff --git a/charts/teleport/templates/application/app-reloader.yaml b/charts/teleport/templates/application/app-reloader.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "2"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appReloader.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appReloader.namespace) }}
     # this has to be installed alongside Trino, so we use the Trino cluster values
     server: {{ eq .Values.appTrino.cluster "" | ternary .Values.global.application.address .Values.appTrino.cluster }}
   project: {{ .Values.global.application.argocd.project }}

diff --git a/charts/teleport/templates/application/app-trino.yaml b/charts/teleport/templates/application/app-trino.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "2"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appTrino.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appTrino.namespace) }}
     server: {{ eq .Values.appTrino.cluster "" | ternary .Values.global.application.address .Values.appTrino.cluster }}
   project: {{ .Values.global.application.argocd.project }}
   syncPolicy:

diff --git a/charts/teleport/templates/management/app-control.yaml b/charts/teleport/templates/management/app-control.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appControl.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appControl.namespace) }}
     server: {{ eq .Values.appControl.cluster "" | ternary .Values.global.management.address .Values.appControl.cluster }}
   project: {{ .Values.global.management.argocd.project }}
   syncPolicy:

diff --git a/charts/teleport/templates/management/app-opa.yaml b/charts/teleport/templates/management/app-opa.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appOpa.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appOpa.namespace) }}
     server: {{ eq .Values.appOpa.cluster "" | ternary .Values.global.management.address .Values.appOpa.cluster }}
   project: {{ .Values.global.management.argocd.project }}
   syncPolicy:

diff --git a/charts/teleport/templates/management/app-vault.yaml b/charts/teleport/templates/management/app-vault.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appVault.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appVault.namespace) }}
     server: {{ eq .Values.appVault.cluster "" | ternary .Values.global.management.address .Values.appVault.cluster }}
   project: {{ .Values.global.management.argocd.project }}
   syncPolicy:

diff --git a/charts/teleport/templates/monitoring/app-loki.yaml b/charts/teleport/templates/monitoring/app-loki.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appLoki.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appLoki.namespace) }}
     server: {{ eq .Values.appLoki.cluster "" | ternary .Values.global.monitoring.address .Values.appLoki.cluster }}
   project: {{ .Values.global.monitoring.argocd.project }}
   syncPolicy:

diff --git a/charts/teleport/templates/monitoring/app-prometheus-stack.yaml b/charts/teleport/templates/monitoring/app-prometheus-stack.yaml
@@ -10,7 +10,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "1"
 spec:
   destination:
-    namespace: "{{ .Values.global.namespacePrefix }}-{{ .Values.appPromStack.namespace }}"
+    namespace: {{ include "teleport.namespace" (dict "Values" .Values "namespace" .Values.appPromStack.namespace) }}
     server: {{ eq .Values.appPromStack.cluster "" | ternary .Values.global.monitoring.address .Values.appPromStack.cluster }}
   project: {{ .Values.global.monitoring.argocd.project }}
   syncPolicy: