move assignNodesFlists to k8s deployer

threefoldtech · Sep 4, 2024 · 61a6c69 · 61a6c69
1 parent e7436d3
commit 61a6c69
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/grid-client/deployer/k8s_deployer.go b/grid-client/deployer/k8s_deployer.go
@@ -98,6 +98,8 @@ func (d *K8sDeployer) Deploy(ctx context.Context, k8sCluster *workloads.K8sClust
 		return err
 	}
 
+	assignNodesFlists(k8sCluster)
+
 	if err := d.Validate(ctx, k8sCluster); err != nil {
 		return err
 	}
@@ -466,3 +468,14 @@ func (d *K8sDeployer) assignNodesIPs(k8sCluster *workloads.K8sCluster) error {
 	}
 	return nil
 }
+
+func assignNodesFlists(k *workloads.K8sCluster) {
+	if k.Flist == "" {
+		k.Flist = k.Master.Flist
+	}
+
+	k.Master.Flist = k.Flist
+	for i := range k.Workers {
+		k.Workers[i].Flist = k.Flist
+	}
+}
diff --git a/grid-client/workloads/k8s.go b/grid-client/workloads/k8s.go
@@ -141,8 +141,6 @@ func (k *K8sCluster) GenerateMetadata() (string, error) {
 }
 
 func (k *K8sCluster) Validate() error {
-	k.assignNodesFlists()
-
 	if err := k.Master.Validate(); err != nil {
 		return errors.Wrap(err, "master is invalid")
 	}
@@ -303,14 +301,3 @@ func (k *K8sNode) zosWorkload(cluster *K8sCluster, isWorker bool) (K8sWorkloads
 
 	return K8sWorkloads
 }
-
-func (k *K8sCluster) assignNodesFlists() {
-	if k.Flist == "" {
-		k.Flist = k.Master.Flist
-	}
-
-	k.Master.Flist = k.Flist
-	for i := range k.Workers {
-		k.Workers[i].Flist = k.Flist
-	}
-}