use zos configs

cmds/identityd/main.go

@@ -68,9 +68,8 @@ func main() {
 		version.ShowAndExit(false)
 	}
 
-	env := environment.MustGet()
-
 	if farm {
+		env := environment.MustGet()
 		fmt.Println(env.FarmID)
 		os.Exit(0)
 	} else if net {
@@ -108,7 +107,7 @@ func main() {
 		log.Fatal().Err(err).Msg("failed to create identity manager")
 	}
 
-	upgrader, err := upgrade.NewUpgrader(root, uint32(env.FarmID), upgrade.NoZosUpgrade(debug))
+	upgrader, err := upgrade.NewUpgrader(root, upgrade.NoZosUpgrade(debug))
 	if err != nil {
 		log.Fatal().Err(err).Msg("failed to initialize upgrader")
 	}

pkg/environment/config.go

@@ -27,6 +27,10 @@ type Config struct {
 	Users struct {
 		Authorized []string `json:"authorized"`
 	} `json:"users"`
+	RolloutUpgrade struct {
+		TestFarms     []uint32 `json:"test_farms"`
+		SafeToUpgrade bool     `json:"safe_to_upgrade"`
+	} `json:"rollout_upgrade"`
 }
 
 // Merge, updates current config with cfg merging and override config

pkg/upgrade/upgrade.go

@@ -20,6 +20,7 @@ import (
 	"github.com/threefoldtech/0-fs/rofs"
 	"github.com/threefoldtech/0-fs/storage"
 	"github.com/threefoldtech/zos/pkg/app"
+	"github.com/threefoldtech/zos/pkg/environment"
 	"github.com/threefoldtech/zos/pkg/upgrade/hub"
 	"github.com/threefoldtech/zos/pkg/zinit"
 
@@ -57,7 +58,6 @@ type Upgrader struct {
 	noZosUpgrade bool
 	hub          *hub.HubClient
 	storage      storage.Storage
-	farmID       uint32
 }
 
 // UpgraderOption interface
@@ -97,12 +97,11 @@ func Zinit(socket string) UpgraderOption {
 }
 
 // NewUpgrader creates a new upgrader instance
-func NewUpgrader(root string, farmID uint32, opts ...UpgraderOption) (*Upgrader, error) {
+func NewUpgrader(root string, opts ...UpgraderOption) (*Upgrader, error) {
 	hubClient := hub.NewHubClient(defaultHubTimeout)
 	u := &Upgrader{
-		root:   root,
-		farmID: farmID,
-		hub:    hubClient,
+		root: root,
+		hub:  hubClient,
 	}
 
 	for _, dir := range []string{u.fileCache(), u.flistCache()} {
@@ -237,13 +236,16 @@ func (u *Upgrader) update() error {
 		return nil
 	}
 
-	rolloutConfigs, err := readRolloutConfig(u.boot.RunMode().String())
+	env := environment.MustGet()
+	config, err := environment.GetConfig()
 	if err != nil {
-		return errors.Wrap(err, "failed to read rollout configs")
+		return errors.Wrap(err, "failed to get network config")
 	}
 
+	rolloutConfigs := config.RolloutUpgrade
+
 	if !rolloutConfigs.SafeToUpgrade {
-		if !slices.Contains(rolloutConfigs.TestFarms, u.farmID) {
+		if !slices.Contains(rolloutConfigs.TestFarms, uint32(env.FarmID)) {
 			// nothing to do! waiting for the flag `safe to upgrade to be enabled after A/B testing`
 			// node is not a part of A/B testing
 			return nil