add entrypoint to k8s cluster workload

threefoldtech · Sep 22, 2024 · 04933fb · 04933fb
1 parent 6931594
commit 04933fb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/grid-client/deployer/k8s_deployer.go b/grid-client/deployer/k8s_deployer.go
@@ -98,7 +98,7 @@ func (d *K8sDeployer) Deploy(ctx context.Context, k8sCluster *workloads.K8sClust
 		return err
 	}
 
-	assignNodesFlists(k8sCluster)
+	assignNodesFlistsAndEntryPoints(k8sCluster)
 
 	if err := d.Validate(ctx, k8sCluster); err != nil {
 		return err
@@ -141,7 +141,7 @@ func (d *K8sDeployer) BatchDeploy(ctx context.Context, k8sClusters []*workloads.
 			return err
 		}
 
-		assignNodesFlists(k8sCluster)
+		assignNodesFlistsAndEntryPoints(k8sCluster)
 
 		if err := d.Validate(ctx, k8sCluster); err != nil {
 			return err
@@ -471,13 +471,18 @@ func (d *K8sDeployer) assignNodesIPs(k8sCluster *workloads.K8sCluster) error {
 	return nil
 }
 
-func assignNodesFlists(k *workloads.K8sCluster) {
+func assignNodesFlistsAndEntryPoints(k *workloads.K8sCluster) {
 	if k.Flist == "" {
 		k.Flist = k.Master.Flist
 	}
+	if k.Entrypoint == "" {
+		k.Entrypoint = k.Master.Entrypoint
+	}
 
 	k.Master.Flist = k.Flist
+	k.Master.Entrypoint = k.Entrypoint
 	for i := range k.Workers {
 		k.Workers[i].Flist = k.Flist
+		k.Workers[i].Entrypoint = k.Entrypoint
 	}
 }
diff --git a/grid-client/deployer/k8s_deployer_test.go b/grid-client/deployer/k8s_deployer_test.go
@@ -153,7 +153,7 @@ func TestK8sDeployer(t *testing.T) {
 	t.Run("test validate master reachable", func(t *testing.T) {
 		k8sMockValidation(d.tfPluginClient.Identity, cl, sub, ncPool, proxyCl, d)
 
-		assignNodesFlists(&k8sCluster)
+		assignNodesFlistsAndEntryPoints(&k8sCluster)
 		err = d.Validate(context.Background(), &k8sCluster)
 		assert.NoError(t, err)
 	})

diff --git a/grid-client/workloads/k8s.go b/grid-client/workloads/k8s.go
@@ -30,6 +30,7 @@ type K8sCluster struct {
 
 	Flist         string `json:"flist"`
 	FlistChecksum string `json:"flist_checksum"`
+	Entrypoint    string `json:"entry_point"`
 
 	// optional
 	SolutionType string

diff --git a/grid-client/workloads/k8s_test.go b/grid-client/workloads/k8s_test.go
@@ -54,6 +54,7 @@ func TestK8sNodeData(t *testing.T) {
 			NetworkName:   "network",
 			Flist:         flist,
 			FlistChecksum: "e71ee7421f45392fbbb92309182e3006",
+			Entrypoint:    "/sbin/zinit init",
 		}
 	})