From a9d303320083a1fdb8661a4b1254ce7a8fe8d030 Mon Sep 17 00:00:00 2001 From: "Matthew R. Kasun" Date: Fri, 26 Aug 2022 11:33:35 -0400 Subject: [PATCH 1/2] update version numbers --- .github/ISSUE_TEMPLATE/bug-report.yml | 1 + compose/docker-compose.reference.yml | 4 ++-- compose/docker-compose.yml | 4 ++-- k8s/client/netclient-daemonset.yaml | 2 +- k8s/client/netclient.yaml | 2 +- k8s/server/netmaker-server.yaml | 2 +- k8s/server/netmaker-ui.yaml | 2 +- netclient/functions/upgrades/{v0-14-7.go => v0-15-0.go} | 8 ++++---- netclient/versioninfo.json | 2 +- 9 files changed, 14 insertions(+), 13 deletions(-) rename netclient/functions/upgrades/{v0-14-7.go => v0-15-0.go} (86%) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index aa5f9343..9c00e4e2 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.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 diff --git a/compose/docker-compose.reference.yml b/compose/docker-compose.reference.yml index d7f71bf5..a79cc3ea 100644 --- a/compose/docker-compose.reference.yml +++ b/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: diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index daf6bf81..bec315e3 100644 --- a/compose/docker-compose.yml +++ b/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: diff --git a/k8s/client/netclient-daemonset.yaml b/k8s/client/netclient-daemonset.yaml index 9fdcb5d6..71208407 100644 --- a/k8s/client/netclient-daemonset.yaml +++ b/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" diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml index 42671114..8c421b4c 100644 --- a/k8s/client/netclient.yaml +++ b/k8s/client/netclient.yaml @@ -28,7 +28,7 @@ spec: # - "" containers: - name: netclient - image: gravitl/netclient:v0.14.6 + image: gravitl/netclient:v0.15.0 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/server/netmaker-server.yaml b/k8s/server/netmaker-server.yaml index 1e43a619..7a6bbd61 100644 --- a/k8s/server/netmaker-server.yaml +++ b/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: diff --git a/k8s/server/netmaker-ui.yaml b/k8s/server/netmaker-ui.yaml index 74563838..7b6b32fa 100644 --- a/k8s/server/netmaker-ui.yaml +++ b/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: diff --git a/netclient/functions/upgrades/v0-14-7.go b/netclient/functions/upgrades/v0-15-0.go similarity index 86% rename from netclient/functions/upgrades/v0-14-7.go rename to netclient/functions/upgrades/v0-15-0.go index c2898d1a..bf66994d 100644 --- a/netclient/functions/upgrades/v0-14-7.go +++ b/netclient/functions/upgrades/v0-15-0.go @@ -5,7 +5,7 @@ import ( "github.com/gravitl/netmaker/netclient/config" ) -var upgrade0147 = UpgradeInfo{ +var upgrade015 = UpgradeInfo{ RequiredVersions: []string{ "v0.14.0", "v0.14.1", @@ -15,11 +15,11 @@ var upgrade0147 = UpgradeInfo{ "v0.14.5", "v0.14.6", }, - NewVersion: "v0.14.7", - OP: update0147, + NewVersion: "v0.15.0", + OP: update015, } -func update0147(cfg *config.ClientConfig) { +func update015(cfg *config.ClientConfig) { //do stuff for 14.X -> 14.6 // No-op /* diff --git a/netclient/versioninfo.json b/netclient/versioninfo.json index 9bdd3f61..1678df16 100644 --- a/netclient/versioninfo.json +++ b/netclient/versioninfo.json @@ -29,7 +29,7 @@ "OriginalFilename": "", "PrivateBuild": "", "ProductName": "Netclient", - "ProductVersion": "v0.14.6.0", + "ProductVersion": "v0.15.0.0", "SpecialBuild": "" }, "VarFileInfo": { From 513609859b9102aa5f4c31275375c30caa609a91 Mon Sep 17 00:00:00 2001 From: afeiszli Date: Fri, 26 Aug 2022 12:08:30 -0400 Subject: [PATCH 2/2] removing upgrade function --- netclient/functions/upgrades/upgrades.go | 3 +- netclient/functions/upgrades/v0-15-0.go | 39 ------------------------ 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 netclient/functions/upgrades/v0-15-0.go diff --git a/netclient/functions/upgrades/upgrades.go b/netclient/functions/upgrades/upgrades.go index 5b9b4471..a7987908 100644 --- a/netclient/functions/upgrades/upgrades.go +++ b/netclient/functions/upgrades/upgrades.go @@ -2,7 +2,8 @@ package upgrades func init() { addUpgrades([]UpgradeInfo{ - upgrade0147, + upgrade0145, + upgrade0146, }) } diff --git a/netclient/functions/upgrades/v0-15-0.go b/netclient/functions/upgrades/v0-15-0.go deleted file mode 100644 index bf66994d..00000000 --- a/netclient/functions/upgrades/v0-15-0.go +++ /dev/null @@ -1,39 +0,0 @@ -package upgrades - -import ( - "github.com/gravitl/netmaker/logger" - "github.com/gravitl/netmaker/netclient/config" -) - -var upgrade015 = 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.15.0", - OP: update015, -} - -func update015(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") -}