update grid client to latest and use one entry point for k8s cluster

threefoldtech · Sep 25, 2024 · 4596cdf · 4596cdf
1 parent 3fafd98
commit 4596cdf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/go.mod b/go.mod
@@ -11,9 +11,9 @@ require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.9.0
-	github.com/threefoldtech/tfgrid-sdk-go/grid-client v0.15.17-0.20240922073632-6931594ee14c
-	github.com/threefoldtech/tfgrid-sdk-go/grid-proxy v0.15.17-0.20240922073632-6931594ee14c
-	github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.15.17-0.20240922073632-6931594ee14c
+	github.com/threefoldtech/tfgrid-sdk-go/grid-client v0.15.17-dev
+	github.com/threefoldtech/tfgrid-sdk-go/grid-proxy v0.15.16
+	github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.15.16
 	github.com/threefoldtech/zos v0.5.6-0.20240902110349-172a0a29a6ee
 	golang.org/x/crypto v0.26.0
 	golang.org/x/sync v0.8.0

diff --git a/go.sum b/go.sum
@@ -672,12 +672,12 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20240827163226-d4e15e206974 h1:95Ox9WYNiwm3mVJeVF/lp7iCpVGA28AkU1atN893eDo=
 github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20240827163226-d4e15e206974/go.mod h1:dtDKAPiUDxAwIkfHV7xcAFZcOm+xwNIuOI1MLFS+MeQ=
-github.com/threefoldtech/tfgrid-sdk-go/grid-client v0.15.17-0.20240922073632-6931594ee14c h1:nEuRaphq6BXc4Uxq5Aay/1FtFJ/MiWmzl6sY4KdNcso=
-github.com/threefoldtech/tfgrid-sdk-go/grid-client v0.15.17-0.20240922073632-6931594ee14c/go.mod h1:MwKEEeKN7qApCdabKRBTs18lrJ6JzA2Xx5Hd2/zb4o0=
-github.com/threefoldtech/tfgrid-sdk-go/grid-proxy v0.15.17-0.20240922073632-6931594ee14c h1:nrw8UfmhMQFdZ64ul6u7jI92+vrfxqvTEIvcWsVeAuQ=
-github.com/threefoldtech/tfgrid-sdk-go/grid-proxy v0.15.17-0.20240922073632-6931594ee14c/go.mod h1:2Z7uJYHeilN7bASpmkcDxtl+3AT8tim6iIvqZ08pwCg=
-github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.15.17-0.20240922073632-6931594ee14c h1:0hDQgJHsncFGl5p/e2ZNbJBK30MSgOhKj4uovmwpAnE=
-github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.15.17-0.20240922073632-6931594ee14c/go.mod h1:cDTivSsUl4r1jN+H8/W6yDqByOOliY8HEGuVuL3ixV8=
+github.com/threefoldtech/tfgrid-sdk-go/grid-client v0.15.17-dev h1:8K2ap34utvjglMwXHJiJ57hmY52CJNMBu3Pofk4ydCU=
+github.com/threefoldtech/tfgrid-sdk-go/grid-client v0.15.17-dev/go.mod h1:MwKEEeKN7qApCdabKRBTs18lrJ6JzA2Xx5Hd2/zb4o0=
+github.com/threefoldtech/tfgrid-sdk-go/grid-proxy v0.15.16 h1:Bnt9POje9hc9nv1YwAu13ABnl63DBMH0qL4SeVhNsIQ=
+github.com/threefoldtech/tfgrid-sdk-go/grid-proxy v0.15.16/go.mod h1:2Z7uJYHeilN7bASpmkcDxtl+3AT8tim6iIvqZ08pwCg=
+github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.15.16 h1:xe3LgMdznykz6d6cOFBt2s+sq3XooOVn20aHOZ3gbQE=
+github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.15.16/go.mod h1:cDTivSsUl4r1jN+H8/W6yDqByOOliY8HEGuVuL3ixV8=
 github.com/threefoldtech/zos v0.5.6-0.20240902110349-172a0a29a6ee h1:pqpYVM0qkXujplHNfH6w5GDqcY5sLJAgOc4/hlR6+Xw=
 github.com/threefoldtech/zos v0.5.6-0.20240902110349-172a0a29a6ee/go.mod h1:lut72yYMJhgK0QRvF0Wd/mB3+OfIoXWz04DQuXck3Sw=
 github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=

diff --git a/internal/provider/k8s.go b/internal/provider/k8s.go
@@ -73,13 +73,13 @@ func newK8sFromSchema(d *schema.ResourceData) (*workloads.K8sCluster, error) {
 	}
 
 	k8s := workloads.K8sCluster{
-		Master:        master,
-		Workers:       workers,
-		Token:         d.Get("token").(string),
-		SSHKey:        d.Get("ssh_key").(string),
-		Flist:         d.Get("flist").(string),
-		FlistChecksum: d.Get("flist_checksum").(string),
-		// EntryPoint:       d.Get("entry_point").(string),
+		Master:           master,
+		Workers:          workers,
+		Token:            d.Get("token").(string),
+		SSHKey:           d.Get("ssh_key").(string),
+		Flist:            d.Get("flist").(string),
+		FlistChecksum:    d.Get("flist_checksum").(string),
+		Entrypoint:       d.Get("entrypoint").(string),
 		NetworkName:      networkName,
 		SolutionType:     solutionType,
 		NodeDeploymentID: nodeDeploymentID,