Browse Source

Merge pull request #1487 from gravitl/feature_v0.15.0_version_number

Feature v0.15.0 version number
Alex Feiszli 3 years ago
parent
commit
2bc017bb0f

+ 1 - 0
.github/ISSUE_TEMPLATE/bug-report.yml

@@ -31,6 +31,7 @@ body:
       label: Version
       description: What version are you running?
       options:
+        - v0.15.0
         - v0.14.6
         - v0.14.5
         - v0.14.4

+ 2 - 2
compose/docker-compose.reference.yml

@@ -3,7 +3,7 @@ version: "3.4"
 services:
   netmaker: # The Primary Server for running Netmaker
     container_name: netmaker
-    image: gravitl/netmaker:v0.14.6
+    image: gravitl/netmaker:v0.15.0
     cap_add: 
       - NET_ADMIN
       - NET_RAW
@@ -62,7 +62,7 @@ services:
       - traefik.http.services.netmaker-api.loadbalancer.server.port=8081
   netmaker-ui:  # The Netmaker UI Component
     container_name: netmaker-ui
-    image: gravitl/netmaker-ui:v0.14.6
+    image: gravitl/netmaker-ui:v0.15.0
     depends_on:
       - netmaker
     links:

+ 2 - 2
compose/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.4"
 services:
   netmaker:
     container_name: netmaker
-    image: gravitl/netmaker:v0.14.6
+    image: gravitl/netmaker:v0.15.0
     cap_add: 
       - NET_ADMIN
       - NET_RAW
@@ -51,7 +51,7 @@ services:
       - traefik.http.services.netmaker-api.loadbalancer.server.port=8081
   netmaker-ui:
     container_name: netmaker-ui
-    image: gravitl/netmaker-ui:v0.14.6
+    image: gravitl/netmaker-ui:v0.15.0
     depends_on:
       - netmaker
     links:

+ 1 - 1
k8s/client/netclient-daemonset.yaml

@@ -16,7 +16,7 @@ spec:
       hostNetwork: true
       containers:
       - name: netclient
-        image: gravitl/netclient-go:v0.14.6
+        image: gravitl/netclient-go:v0.15.0
         env:
         - name: TOKEN
           value: "TOKEN_VALUE"

+ 1 - 1
k8s/client/netclient.yaml

@@ -28,7 +28,7 @@ spec:
       #           - "<node label value>"
       containers:
       - name: netclient
-        image: gravitl/netclient:v0.14.6
+        image: gravitl/netclient:v0.15.0
         env:
         - name: TOKEN
           value: "TOKEN_VALUE"

+ 1 - 1
k8s/server/netmaker-server.yaml

@@ -83,7 +83,7 @@ spec:
           value: "Kubernetes"
         - name: VERBOSITY
           value: "3"
-        image: gravitl/netmaker:v0.14.6
+        image: gravitl/netmaker:v0.15.0
         imagePullPolicy: Always
         name: netmaker
         ports:

+ 1 - 1
k8s/server/netmaker-ui.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: netmaker-ui
-        image: gravitl/netmaker-ui:v0.14.6
+        image: gravitl/netmaker-ui:v0.15.0
         ports:
         - containerPort: 443
         env:

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

@@ -2,7 +2,8 @@ package upgrades
 
 func init() {
 	addUpgrades([]UpgradeInfo{
-		upgrade0147,
+		upgrade0145,
+		upgrade0146,
 	})
 }
 

+ 0 - 39
netclient/functions/upgrades/v0-14-7.go

@@ -1,39 +0,0 @@
-package upgrades
-
-import (
-	"github.com/gravitl/netmaker/logger"
-	"github.com/gravitl/netmaker/netclient/config"
-)
-
-var upgrade0147 = UpgradeInfo{
-	RequiredVersions: []string{
-		"v0.14.0",
-		"v0.14.1",
-		"v0.14.2",
-		"v0.14.3",
-		"v0.14.4",
-		"v0.14.5",
-		"v0.14.6",
-	},
-	NewVersion: "v0.14.7",
-	OP:         update0147,
-}
-
-func update0147(cfg *config.ClientConfig) {
-	//do stuff for 14.X -> 14.6
-	// No-op
-	/*
-		if runtime.GOARCH == "darwin" {
-			oldLocation := "/Applications/Netclient"
-			newLocation := ncutils.MAC_APP_DATA_PATH
-			err := os.Rename(oldLocation, newLocation)
-			if err != nil {
-				logger.FatalLog("There was an issue moving the Netclient file from Applications to Application Support:", err.Error())
-			} else {
-				logger.Log(0, "The Netclient data file has been moved from Applications to Application Support")
-			}
-
-		}
-	*/
-	logger.Log(0, "updating schema for v0.14.7")
-}

+ 1 - 1
netclient/versioninfo.json

@@ -29,7 +29,7 @@
         "OriginalFilename": "",
         "PrivateBuild": "",
         "ProductName": "Netclient",
-        "ProductVersion": "v0.14.6.0",
+        "ProductVersion": "v0.15.0.0",
         "SpecialBuild": ""
     },
     "VarFileInfo": {