⚡ use resolve version on reconciliation

cyclops-ui · May 2, 2024 · 5631c8b · 5631c8b
1 parent 2031b24
commit 5631c8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cyclops-ctrl/internal/controller/modules.go b/cyclops-ctrl/internal/controller/modules.go
@@ -287,7 +287,7 @@ func (m *Modules) ResourcesForModule(ctx *gin.Context) {
 	t, err := m.templatesRepo.GetTemplate(
 		module.Spec.TemplateRef.URL,
 		module.Spec.TemplateRef.Path,
-		module.Spec.TemplateRef.Version,
+		module.Status.TemplateResolvedVersion,
 	)
 	if err != nil {
 		fmt.Println(err)

diff --git a/cyclops-ctrl/internal/modulecontroller/module_controller.go b/cyclops-ctrl/internal/modulecontroller/module_controller.go
@@ -115,10 +115,15 @@ func (r *ModuleReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 
 	r.logger.Info("upsert module", "namespaced name", req.NamespacedName)
 
+	templateVersion := module.Status.TemplateResolvedVersion
+	if len(templateVersion) == 0 {
+		templateVersion = module.Spec.TemplateRef.Version
+	}
+
 	template, err := r.templatesRepo.GetTemplate(
 		module.Spec.TemplateRef.URL,
 		module.Spec.TemplateRef.Path,
-		module.Spec.TemplateRef.Version,
+		templateVersion,
 	)
 	if err != nil {
 		r.logger.Error(err, "error fetching module template", "namespaced name", req.NamespacedName)