Only distribute templates that are managed by KCM template chains

Closes #705
k0rdent · Jan 20, 2025 · c9982fc · c9982fc
1 parent 438998e
commit c9982fc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/internal/controller/templatechain_controller.go b/internal/controller/templatechain_controller.go
@@ -95,7 +95,8 @@ func (r *TemplateChainReconciler) ReconcileTemplateChain(ctx context.Context, te
 		return ctrl.Result{}, err
 	}
 
-	if templateChain.GetNamespace() == r.SystemNamespace {
+	if templateChain.GetNamespace() == r.SystemNamespace ||
+		templateChain.GetLabels()[kcm.KCMManagedLabelKey] != kcm.KCMManagedLabelValue {
 		return ctrl.Result{}, nil
 	}
 

diff --git a/internal/controller/templatechain_controller_test.go b/internal/controller/templatechain_controller_test.go
@@ -170,7 +170,10 @@ var _ = Describe("Template Chain Controller", func() {
 						ObjectMeta: metav1.ObjectMeta{
 							Name:      chain.Name,
 							Namespace: chain.Namespace,
-							Labels:    map[string]string{kcmv1.GenericComponentLabelName: kcmv1.GenericComponentLabelValueKCM},
+							Labels: map[string]string{
+								kcmv1.GenericComponentLabelName: kcmv1.GenericComponentLabelValueKCM,
+								kcmv1.KCMManagedLabelKey:        kcmv1.KCMManagedLabelValue,
+							},
 						},
 						Spec: kcmv1.TemplateChainSpec{SupportedTemplates: supportedClusterTemplates[chain.Name]},
 					}
@@ -186,7 +189,10 @@ var _ = Describe("Template Chain Controller", func() {
 						ObjectMeta: metav1.ObjectMeta{
 							Name:      chain.Name,
 							Namespace: chain.Namespace,
-							Labels:    map[string]string{kcmv1.GenericComponentLabelName: kcmv1.GenericComponentLabelValueKCM},
+							Labels: map[string]string{
+								kcmv1.GenericComponentLabelName: kcmv1.GenericComponentLabelValueKCM,
+								kcmv1.KCMManagedLabelKey:        kcmv1.KCMManagedLabelValue,
+							},
 						},
 						Spec: kcmv1.TemplateChainSpec{SupportedTemplates: supportedServiceTemplates[chain.Name]},
 					}