dev: use creator params

Altinity · May 17, 2024 · 26025ee · 26025ee
1 parent 91f4d2e
commit 26025ee
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/pkg/controller/chi/worker-chi-reconciler.go b/pkg/controller/chi/worker-chi-reconciler.go
@@ -1237,7 +1237,7 @@ func (w *worker) fetchPVC(
 	if volume.OperatorShouldCreatePVC(host, volumeClaimTemplate) {
 		// Operator is in charge of PVCs
 		// Create PVC model.
-		pvc = w.task.creator.CreatePVC(pvcName, host, &volumeClaimTemplate.Spec)
+		pvc = w.task.creator.CreatePVC(pvcName, namespace, host, &volumeClaimTemplate.Spec)
 		w.a.V(1).M(host).Info("PVC (%s/%s/%s/%s) model provided by the operator", namespace, host.GetName(), volumeMount.Name, pvcName)
 		return pvc, volumeClaimTemplate, true, nil
 	}
@@ -1270,6 +1270,6 @@ func (w *worker) reconcilePVC(
 	}
 
 	w.applyPVCResourcesRequests(pvc, template)
-	pvc = w.task.creator.PreparePersistentVolumeClaim(pvc, host, template)
+	pvc = w.task.creator.AdjustPersistentVolumeClaim(pvc, host, template)
 	return w.c.updatePersistentVolumeClaim(ctx, pvc)
 }
diff --git a/pkg/controller/chi/worker.go b/pkg/controller/chi/worker.go
@@ -102,14 +102,25 @@ func (c *Controller) newWorker(q queue.PriorityQueue, sys bool) *worker {
 
 // newContext creates new reconcile task
 func (w *worker) newTask(chi *api.ClickHouseInstallation) {
-	w.task = newTask(chiCreator.NewCreator(chi, config.NewClickHouseConfigFilesGenerator(chi, &config.ConfigGeneratorOptions{
-		Users:          chi.GetSpec().Configuration.Users,
-		Profiles:       chi.GetSpec().Configuration.Profiles,
-		Quotas:         chi.GetSpec().Configuration.Quotas,
-		Settings:       chi.GetSpec().Configuration.Settings,
-		Files:          chi.GetSpec().Configuration.Files,
-		DistributedDDL: chi.GetSpec().Defaults.DistributedDDL,
-	})))
+	w.task = newTask(
+		chiCreator.NewCreator(
+			chi,
+			config.NewClickHouseConfigFilesGenerator(
+				chi,
+				&config.ConfigGeneratorOptions{
+					Users:          chi.GetSpec().Configuration.Users,
+					Profiles:       chi.GetSpec().Configuration.Profiles,
+					Quotas:         chi.GetSpec().Configuration.Quotas,
+					Settings:       chi.GetSpec().Configuration.Settings,
+					Files:          chi.GetSpec().Configuration.Files,
+					DistributedDDL: chi.GetSpec().Defaults.DistributedDDL,
+				},
+			),
+			chiCreator.NewContainerManager(chiCreator.ContainerManagerTypeClickHouse),
+			chiCreator.NewProbeManager(chiCreator.ProbeManagerTypeClickHouse),
+			chiCreator.NewServiceManager(chiCreator.ServiceManagerTypeClickHouse),
+		),
+	)
 }
 
 // timeToStart specifies time that operator does not accept changes