feat(tenant): add templating support for additionalmetadatalist (#1613)

* feat(tenant): add templating support for additionalmetadatalist

Signed-off-by: Hristo Hristov <[email protected]>

* feat(tenant): add e2e tests

Signed-off-by: Hristo Hristov <[email protected]>

* feat(tenant): add e2e tests

Signed-off-by: Hristo Hristov <[email protected]>

* feat(tenant): add e2e tests

Signed-off-by: Hristo Hristov <[email protected]>

---------

Signed-off-by: Hristo Hristov <[email protected]>

Author: Svarrogh1337

controllers/tenant/namespaces.go

@@ -9,6 +9,7 @@ import (
 	"maps"
 	"strings"
 
+	"github.com/valyala/fasttemplate"
 	"golang.org/x/sync/errgroup"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/fields"
@@ -119,6 +120,23 @@ func buildNamespaceAnnotationsForTenant(tnt *capsulev1beta2.Tenant) map[string]s
 	return annotations
 }
 
+// applyTemplateMap applies templating to all values in the provided map in place.
+func applyTemplateMap(m map[string]string, tnt *capsulev1beta2.Tenant, ns *corev1.Namespace) {
+	for k, v := range m {
+		if !strings.Contains(v, "{{ ") && !strings.Contains(v, " }}") {
+			continue
+		}
+
+		t := fasttemplate.New(v, "{{ ", " }}")
+		tmplString := t.ExecuteString(map[string]interface{}{
+			"tenant.name": tnt.Name,
+			"namespace":   ns.Name,
+		})
+
+		m[k] = tmplString
+	}
+}
+
 func buildNamespaceLabelsForTenant(tnt *capsulev1beta2.Tenant) map[string]string {
 	labels := make(map[string]string)
 
@@ -183,6 +201,9 @@ func SyncNamespaceMetadata(tnt *capsulev1beta2.Tenant, ns *corev1.Namespace) err
 				continue
 			}
 
+			applyTemplateMap(md.Labels, tnt, ns)
+			applyTemplateMap(md.Annotations, tnt, ns)
+
 			maps.Copy(labels, md.Labels)
 			maps.Copy(annotations, md.Annotations)
 		}

e2e/namespace_additional_metadata_test.go

@@ -92,6 +92,7 @@ var _ = Describe("creating a Namespace for a Tenant with additional metadata", L
 				return
 			}, defaultTimeoutInterval, defaultPollInterval).Should(BeTrue())
 		})
+
 		By("checking additional annotations", func() {
 			Eventually(func() (ok bool) {
 				Expect(k8sClient.Get(context.TODO(), types.NamespacedName{Name: ns.GetName()}, ns)).Should(Succeed())
@@ -172,6 +173,16 @@ var _ = Describe("creating a Namespace for a Tenant with additional metadata lis
 							"k8s.io/custom-annotation_3": "bizz",
 						},
 					},
+					{
+						Labels: map[string]string{
+							"projectcapsule.dev/templated-tenant-label":    "{{ tenant.name }}",
+							"projectcapsule.dev/templated-namespace-label": "{{ namespace }}",
+						},
+						Annotations: map[string]string{
+							"projectcapsule.dev/templated-tenant-annotation":    "{{ tenant.name }}",
+							"projectcapsule.dev/templated-namespace-annotation": "{{ namespace }}",
+						},
+					},
 				},
 			},
 		},
@@ -194,6 +205,30 @@ var _ = Describe("creating a Namespace for a Tenant with additional metadata lis
 		NamespaceCreation(ns, tnt.Spec.Owners[0], defaultTimeoutInterval).Should(Succeed())
 		TenantNamespaceList(tnt, defaultTimeoutInterval).Should(ContainElement(ns.GetName()))
 
+		By("checking templated annotations", func() {
+			Eventually(func() (ok bool) {
+				Expect(k8sClient.Get(context.TODO(), types.NamespacedName{Name: ns.GetName()}, ns)).Should(Succeed())
+				if ok, _ = HaveKeyWithValue("projectcapsule.dev/templated-tenant-annotation", tnt.Name).Match(ns.Annotations); !ok {
+					return
+				}
+				if ok, _ = HaveKeyWithValue("projectcapsule.dev/templated-namespace-annotation", ns.Name).Match(ns.Annotations); !ok {
+					return
+				}
+				return
+			}, defaultTimeoutInterval, defaultPollInterval).Should(BeTrue())
+		})
+		By("checking templated labels", func() {
+			Eventually(func() (ok bool) {
+				Expect(k8sClient.Get(context.TODO(), types.NamespacedName{Name: ns.GetName()}, ns)).Should(Succeed())
+				if ok, _ = HaveKeyWithValue("projectcapsule.dev/templated-tenant-label", tnt.Name).Match(ns.Labels); !ok {
+					return
+				}
+				if ok, _ = HaveKeyWithValue("projectcapsule.dev/templated-namespace-label", ns.Name).Match(ns.Labels); !ok {
+					return
+				}
+				return
+			}, defaultTimeoutInterval, defaultPollInterval).Should(BeTrue())
+		})
 		By("checking additional labels from entry without node selector", func() {
 			Eventually(func() (ok bool) {
 				Expect(k8sClient.Get(context.TODO(), types.NamespacedName{Name: ns.GetName()}, ns)).Should(Succeed())