Browse Source

Merge pull request #1570 from gravitl/feature_v0.16.0_upgrade

added 0.16.0 upgrade logic
Alex Feiszli 2 years ago
parent
commit
324c8becbd

+ 1 - 1
.github/workflows/test.yml

@@ -81,7 +81,7 @@ jobs:
             sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev 
             go test -p 1 ./... -v
             go install honnef.co/go/tools/cmd/staticcheck@latest
-            ~/go/bin/staticcheck ./...
+            { ~/go/bin/staticcheck  -tags=ee ./... ; ~/go/bin/staticcheck ./... ; } | ~/go/bin/staticcheck -merge
         env:
           DATABASE: sqlite
           CLIENT_MODE: "off"

+ 1 - 0
netclient/functions/clientconfig.go

@@ -14,6 +14,7 @@ import (
 // Usage :  set update required to true and and update logic to function
 func UpdateClientConfig() {
 	defer upgrades.ReleaseUpgrades()
+	upgrades.InitializeUpgrades()
 
 	networks, _ := ncutils.GetSystemNetworks()
 	if len(networks) == 0 {

+ 3 - 2
netclient/functions/upgrades/upgrades.go

@@ -1,10 +1,11 @@
 package upgrades
 
-func init() {
+// InitializeUpgrades - initializes written upgrades
+func InitializeUpgrades() {
 	addUpgrades([]UpgradeInfo{
 		upgrade0145,
 		upgrade0146,
-		upgrade0148,
+		upgrade0160,
 	})
 }
 

+ 0 - 22
netclient/functions/upgrades/v0-14-8.go

@@ -1,22 +0,0 @@
-package upgrades
-
-import (
-	"github.com/gravitl/netmaker/netclient/config"
-)
-
-var upgrade0148 = UpgradeInfo{
-	RequiredVersions: []string{
-		"v0.14.5",
-		"v0.14.6",
-		"v0.14.7",
-	},
-	NewVersion: "v0.14.8",
-	OP:         update0148,
-}
-
-func update0148(cfg *config.ClientConfig) {
-	// set connect default if not present 14.X -> 14.8
-	if cfg.Node.Connected == "" {
-		cfg.Node.SetDefaultConnected()
-	}
-}

+ 23 - 0
netclient/functions/upgrades/v0-16-0.go

@@ -0,0 +1,23 @@
+package upgrades
+
+import (
+	"github.com/gravitl/netmaker/netclient/config"
+)
+
+var upgrade0160 = UpgradeInfo{
+	RequiredVersions: []string{
+		"v0.14.6",
+		"v0.15.0",
+		"v0.15.1",
+		"v0.15.2",
+	},
+	NewVersion: "v0.16.0",
+	OP:         update0160,
+}
+
+func update0160(cfg *config.ClientConfig) {
+	// set connect default if not present 15.X -> 16.0
+	if cfg.Node.Connected == "" {
+		cfg.Node.SetDefaultConnected()
+	}
+}