From 66cbc96b894f455de40c5342ef37c5d473e8079b Mon Sep 17 00:00:00 2001 From: "Matthew R. Kasun" Date: Tue, 26 Jul 2022 13:45:41 -0400 Subject: [PATCH 1/2] 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/server/netmaker-server.yaml | 2 +- netclient/functions/upgrades/v0-14-5.go | 3 ++- netclient/versioninfo.json | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 54d84810..aa5f9343 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.14.6 - v0.14.5 - v0.14.4 - v0.14.3 diff --git a/compose/docker-compose.reference.yml b/compose/docker-compose.reference.yml index b9ffd2b1..d7f71bf5 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.5 + image: gravitl/netmaker:v0.14.6 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.5 + image: gravitl/netmaker-ui:v0.14.6 depends_on: - netmaker links: diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 104caa3c..daf6bf81 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.5 + image: gravitl/netmaker:v0.14.6 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.5 + image: gravitl/netmaker-ui:v0.14.6 depends_on: - netmaker links: diff --git a/k8s/client/netclient-daemonset.yaml b/k8s/client/netclient-daemonset.yaml index 7632d5c0..9fdcb5d6 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.5 + image: gravitl/netclient-go:v0.14.6 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/server/netmaker-server.yaml b/k8s/server/netmaker-server.yaml index 7376ca96..1e43a619 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.5 + image: gravitl/netmaker:v0.14.6 imagePullPolicy: Always name: netmaker ports: diff --git a/netclient/functions/upgrades/v0-14-5.go b/netclient/functions/upgrades/v0-14-5.go index 1d41638d..8f1e30bc 100644 --- a/netclient/functions/upgrades/v0-14-5.go +++ b/netclient/functions/upgrades/v0-14-5.go @@ -12,8 +12,9 @@ var upgrade0145 = UpgradeInfo{ "v0.14.2", "v0.14.3", "v0.14.4", + "v0.14.5", }, - NewVersion: "v0.14.5", + NewVersion: "v0.14.6", OP: update0145, } diff --git a/netclient/versioninfo.json b/netclient/versioninfo.json index db5a635c..2090324d 100644 --- a/netclient/versioninfo.json +++ b/netclient/versioninfo.json @@ -29,7 +29,7 @@ "OriginalFilename": "", "PrivateBuild": "", "ProductName": "Netclient", - "ProductVersion": "v0.14.5.0", + "ProductVersion": "v0.14.6.0", "SpecialBuild": "" }, "VarFileInfo": { From da828263cb193bc7b34d8a2134466eb450fcb042 Mon Sep 17 00:00:00 2001 From: "Matthew R. Kasun" Date: Tue, 26 Jul 2022 14:24:22 -0400 Subject: [PATCH 2/2] more version number changes Signed-off-by: Matthew R. Kasun --- netclient/functions/upgrades/v0-14-5.go | 3 +-- netclient/functions/upgrades/v0.14.-6.go | 25 ++++++++++++++++++++++++ netclient/versioninfo.json | 4 ++-- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 netclient/functions/upgrades/v0.14.-6.go diff --git a/netclient/functions/upgrades/v0-14-5.go b/netclient/functions/upgrades/v0-14-5.go index 8f1e30bc..1d41638d 100644 --- a/netclient/functions/upgrades/v0-14-5.go +++ b/netclient/functions/upgrades/v0-14-5.go @@ -12,9 +12,8 @@ var upgrade0145 = UpgradeInfo{ "v0.14.2", "v0.14.3", "v0.14.4", - "v0.14.5", }, - NewVersion: "v0.14.6", + NewVersion: "v0.14.5", OP: update0145, } diff --git a/netclient/functions/upgrades/v0.14.-6.go b/netclient/functions/upgrades/v0.14.-6.go new file mode 100644 index 00000000..2458726c --- /dev/null +++ b/netclient/functions/upgrades/v0.14.-6.go @@ -0,0 +1,25 @@ +package upgrades + +import ( + "github.com/gravitl/netmaker/logger" + "github.com/gravitl/netmaker/netclient/config" +) + +var upgrade0146 = UpgradeInfo{ + RequiredVersions: []string{ + "v0.14.0", + "v0.14.1", + "v0.14.2", + "v0.14.3", + "v0.14.4", + "v0.14.5", + }, + NewVersion: "v0.14.6", + OP: update0146, +} + +func update0146(cfg *config.ClientConfig) { + // do stuff for 14.X -> 14.5 + // No-op + logger.Log(0, "updating schema for 0.14.6") +} diff --git a/netclient/versioninfo.json b/netclient/versioninfo.json index 2090324d..9bdd3f61 100644 --- a/netclient/versioninfo.json +++ b/netclient/versioninfo.json @@ -3,13 +3,13 @@ "FileVersion": { "Major": 0, "Minor": 14, - "Patch": 3, + "Patch": 6, "Build": 0 }, "ProductVersion": { "Major": 0, "Minor": 14, - "Patch": 3, + "Patch": 6, "Build": 0 }, "FileFlagsMask": "3f",