From 70bb7240d0299b5a6a1485c24df6d4617449abd3 Mon Sep 17 00:00:00 2001
From: Andrei Kvapil <kvapss@gmail.com>
Date: Fri, 9 Feb 2024 13:24:33 +0100
Subject: [PATCH] Fix: tenant-root domain always overrided to example.org (#10)

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
---
 packages/core/platform/Makefile            | 12 +++++++-----
 packages/core/platform/templates/apps.yaml |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/core/platform/Makefile b/packages/core/platform/Makefile
index e38a0947..74668225 100644
--- a/packages/core/platform/Makefile
+++ b/packages/core/platform/Makefile
@@ -1,17 +1,19 @@
 NAMESPACE=cozy-system
 NAME=platform
 
+API_VERSIONS_FLAGS=$(addprefix -a ,$(shell kubectl api-versions))
+
 show:
-	helm template -n $(NAMESPACE) $(NAME) . --dry-run=server
+	helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS)
 
 apply:
-	helm template -n $(NAMESPACE) $(NAME) . --dry-run=server | kubectl apply -f-
+	helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS) | kubectl apply -f-
 
 namespaces-show:
-	helm template -n $(NAMESPACE) $(NAME) . --dry-run=server -s templates/namespaces.yaml
+	helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS) -s templates/namespaces.yaml
 
 namespaces-apply:
-	helm template -n $(NAMESPACE) $(NAME) . --dry-run=server -s templates/namespaces.yaml | kubectl apply -f-
+	helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS) -s templates/namespaces.yaml | kubectl apply -f-
 
 diff:
-	helm template -n $(NAMESPACE) $(NAME) . --dry-run=server -s templates/namespaces.yaml | kubectl diff -f-
+	helm template -n $(NAMESPACE) $(NAME) . --dry-run=server $(API_VERSIONS_FLAGS) -s templates/namespaces.yaml | kubectl diff -f-
diff --git a/packages/core/platform/templates/apps.yaml b/packages/core/platform/templates/apps.yaml
index 74439ff2..6f3091f3 100644
--- a/packages/core/platform/templates/apps.yaml
+++ b/packages/core/platform/templates/apps.yaml
@@ -1,7 +1,7 @@
 {{- $host := "example.org" }}
 {{- $tenantRoot := list }}
 {{- if .Capabilities.APIVersions.Has "helm.toolkit.fluxcd.io/v2beta1" }}
-{{- $tenantRoot := lookup "helm.toolkit.fluxcd.io/v2beta1" "HelmRelease" "tenant-root" "tenant-root" }}
+{{- $tenantRoot = lookup "helm.toolkit.fluxcd.io/v2beta1" "HelmRelease" "tenant-root" "tenant-root" }}
 {{- end }}
 {{- if and $tenantRoot $tenantRoot.spec $tenantRoot.spec.values $tenantRoot.spec.values.host }}
 {{- $host = $tenantRoot.spec.values.host }}