Merge pull request #5 from threefoldtech/support-zos4-upgrade

update upgrader module to get latest zos version from the registrar
threefoldtech · Feb 6, 2025 · fba513c · fba513c
2 parents 313fcce + 5dcad7a
commit fba513c
Show file tree

Hide file tree

Showing 5 changed files with 760 additions and 3 deletions.
diff --git a/cmds/identityd/main.go b/cmds/identityd/main.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/threefoldtech/zos4/pkg/stubs"
+	"github.com/threefoldtech/zos4/pkg/upgrade"
 	"github.com/threefoldtech/zosbase/pkg/app"
-	"github.com/threefoldtech/zosbase/pkg/upgrade"
 
 	"github.com/threefoldtech/zos4/pkg"
 	"github.com/threefoldtech/zos4/pkg/identity"

diff --git a/pkg/registrar_gateway/registrar_gateway.go b/pkg/registrar_gateway/registrar_gateway.go
@@ -67,7 +67,7 @@ func NewRegistrarGateway(cl zbus.Client) (zos4Pkg.RegistrarGateway, error) {
 }
 
 func (r *registrarGateway) GetZosVersion() (string, error) {
-	url := fmt.Sprintf("%s/v1/nodes/%d/version", r.baseURL, r.nodeID)
+	url := fmt.Sprintf("%s/v1/zos/version", r.baseURL)
 	log.Debug().Str("url", url).Msg("requesting zos version")
 
 	return r.getZosVersion(url)

diff --git a/pkg/types/types.go b/pkg/types/types.go
@@ -11,7 +11,7 @@ type UpdateNodeRequest struct {
 	FarmID       uint64      `json:"farm_id" binding:"required,min=1"`
 	Resources    Resources   `json:"resources" binding:"required"`
 	Location     Location    `json:"location" binding:"required"`
-	Interfaces   []Interface `json:"interfaces" binding:"required`
+	Interfaces   []Interface `json:"interfaces" binding:"required"`
 	SecureBoot   bool        `json:"secure_boot"`
 	Virtualized  bool        `json:"virtualized"`
 	SerialNumber string      `json:"serial_number" binding:"required"`