From 58cd6e4884cfd7c54e0693c869def6e63a496c80 Mon Sep 17 00:00:00 2001 From: theguy951357 Date: Mon, 24 Apr 2023 16:34:02 -0400 Subject: [PATCH 1/2] update develop to v0.18.8 --- .github/ISSUE_TEMPLATE/bug-report.yml | 1 + README.md | 2 +- compose/docker-compose-emqx.yml | 4 ++-- compose/docker-compose.netclient.yml | 2 +- controllers/docs.go | 2 +- k8s/client/netclient-daemonset.yaml | 2 +- k8s/client/netclient.yaml | 2 +- k8s/server/netmaker-server.yaml | 2 +- k8s/server/netmaker-ui.yaml | 2 +- main.go | 2 +- release.md | 2 +- swagger.yaml | 2 +- 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 308324d0..1037773c 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.18.8 - v0.18.7 - v0.18.6 - v0.18.5 diff --git a/README.md b/README.md index 37467723..db3b83ea 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@

- + diff --git a/compose/docker-compose-emqx.yml b/compose/docker-compose-emqx.yml index e7899e18..81801572 100644 --- a/compose/docker-compose-emqx.yml +++ b/compose/docker-compose-emqx.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: container_name: netmaker - image: gravitl/netmaker:v0.18.7 + image: gravitl/netmaker:v0.18.8 restart: on-failure volumes: - dnsconfig:/root/config/dnsconfig @@ -36,7 +36,7 @@ services: - "3478:3478/udp" netmaker-ui: container_name: netmaker-ui - image: gravitl/netmaker-ui:v0.18.7 + image: gravitl/netmaker-ui:v0.18.8 depends_on: - netmaker links: diff --git a/compose/docker-compose.netclient.yml b/compose/docker-compose.netclient.yml index 2c949fdf..a4e05e2c 100644 --- a/compose/docker-compose.netclient.yml +++ b/compose/docker-compose.netclient.yml @@ -3,7 +3,7 @@ version: "3.4" services: netclient: container_name: netclient - image: 'gravitl/netclient:v0.18.7' + image: 'gravitl/netclient:v0.18.8' hostname: netmaker-1 network_mode: host restart: on-failure diff --git a/controllers/docs.go b/controllers/docs.go index c6b05d4e..be6df49c 100644 --- a/controllers/docs.go +++ b/controllers/docs.go @@ -10,7 +10,7 @@ // // Schemes: https // BasePath: / -// Version: 0.18.7 +// Version: 0.18.8 // Host: netmaker.io // // Consumes: diff --git a/k8s/client/netclient-daemonset.yaml b/k8s/client/netclient-daemonset.yaml index 2416fd77..20943d2a 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:v0.18.7 + image: gravitl/netclient:v0.18.8 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml index 3f57229a..709294fc 100644 --- a/k8s/client/netclient.yaml +++ b/k8s/client/netclient.yaml @@ -28,7 +28,7 @@ spec: # - "" containers: - name: netclient - image: gravitl/netclient:v0.18.7 + image: gravitl/netclient:v0.18.8 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/server/netmaker-server.yaml b/k8s/server/netmaker-server.yaml index 94032acb..94c0c1d2 100644 --- a/k8s/server/netmaker-server.yaml +++ b/k8s/server/netmaker-server.yaml @@ -79,7 +79,7 @@ spec: value: "Kubernetes" - name: VERBOSITY value: "3" - image: gravitl/netmaker:v0.18.7 + image: gravitl/netmaker:v0.18.8 imagePullPolicy: Always name: netmaker ports: diff --git a/k8s/server/netmaker-ui.yaml b/k8s/server/netmaker-ui.yaml index 58d4ff97..fe1ba7c2 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.18.7 + image: gravitl/netmaker-ui:v0.18.8 ports: - containerPort: 443 env: diff --git a/main.go b/main.go index fafa8540..b4847260 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ import ( stunserver "github.com/gravitl/netmaker/stun-server" ) -var version = "v0.18.7" +var version = "v0.18.8" // Start DB Connection and start API Request Handler func main() { diff --git a/release.md b/release.md index 02382cfc..08f2dcb9 100644 --- a/release.md +++ b/release.md @@ -1,4 +1,4 @@ -# Netmaker v0.18.7 +# Netmaker v0.18.8 ## whats new - internet gateways (0.0.0.0/0) for egress diff --git a/swagger.yaml b/swagger.yaml index 9e96a2a1..bac543ce 100644 --- a/swagger.yaml +++ b/swagger.yaml @@ -704,7 +704,7 @@ info: API calls must be authenticated via a header of the format -H “Authorization: Bearer ” There are two methods to obtain YOUR_SECRET_KEY: 1. Using the masterkey. By default, this value is “secret key,” but you should change this on your instance and keep it secure. This value can be set via env var at startup or in a config file (config/environments/< env >.yaml). See the [Netmaker](https://docs.netmaker.org/index.html) documentation for more details. 2. Using a JWT received for a node. This can be retrieved by calling the /api/nodes//authenticate endpoint, as documented below. title: Netmaker - version: 0.18.7 + version: 0.18.8 paths: /api/dns: get: From ee27f22478e2ae427795937d9ddd1658013a163f Mon Sep 17 00:00:00 2001 From: theguy951357 Date: Tue, 2 May 2023 22:18:05 -0400 Subject: [PATCH 2/2] update to v0.19.0 instead --- .github/ISSUE_TEMPLATE/bug-report.yml | 2 +- README.md | 2 +- compose/docker-compose-emqx.yml | 4 ++-- compose/docker-compose.netclient.yml | 2 +- controllers/docs.go | 2 +- k8s/client/netclient-daemonset.yaml | 2 +- k8s/client/netclient.yaml | 2 +- k8s/server/netmaker-server.yaml | 2 +- k8s/server/netmaker-ui.yaml | 2 +- main.go | 2 +- release.md | 2 +- scripts/nm-upgrade.sh | 2 +- swagger.yaml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 1037773c..e5c3ce1b 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -31,7 +31,7 @@ body: label: Version description: What version are you running? options: - - v0.18.8 + - v0.19.0 - v0.18.7 - v0.18.6 - v0.18.5 diff --git a/README.md b/README.md index db3b83ea..fc0aaf8b 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@

- + diff --git a/compose/docker-compose-emqx.yml b/compose/docker-compose-emqx.yml index 81801572..e06245f6 100644 --- a/compose/docker-compose-emqx.yml +++ b/compose/docker-compose-emqx.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: container_name: netmaker - image: gravitl/netmaker:v0.18.8 + image: gravitl/netmaker:v0.19.0 restart: on-failure volumes: - dnsconfig:/root/config/dnsconfig @@ -36,7 +36,7 @@ services: - "3478:3478/udp" netmaker-ui: container_name: netmaker-ui - image: gravitl/netmaker-ui:v0.18.8 + image: gravitl/netmaker-ui:v0.19.0 depends_on: - netmaker links: diff --git a/compose/docker-compose.netclient.yml b/compose/docker-compose.netclient.yml index a4e05e2c..1a83b700 100644 --- a/compose/docker-compose.netclient.yml +++ b/compose/docker-compose.netclient.yml @@ -3,7 +3,7 @@ version: "3.4" services: netclient: container_name: netclient - image: 'gravitl/netclient:v0.18.8' + image: 'gravitl/netclient:v0.19.0' hostname: netmaker-1 network_mode: host restart: on-failure diff --git a/controllers/docs.go b/controllers/docs.go index be6df49c..fae0208f 100644 --- a/controllers/docs.go +++ b/controllers/docs.go @@ -10,7 +10,7 @@ // // Schemes: https // BasePath: / -// Version: 0.18.8 +// Version: 0.19.0 // Host: netmaker.io // // Consumes: diff --git a/k8s/client/netclient-daemonset.yaml b/k8s/client/netclient-daemonset.yaml index 20943d2a..a2997ab2 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:v0.18.8 + image: gravitl/netclient:v0.19.0 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml index 709294fc..8bb1006b 100644 --- a/k8s/client/netclient.yaml +++ b/k8s/client/netclient.yaml @@ -28,7 +28,7 @@ spec: # - "" containers: - name: netclient - image: gravitl/netclient:v0.18.8 + image: gravitl/netclient:v0.19.0 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/server/netmaker-server.yaml b/k8s/server/netmaker-server.yaml index 94c0c1d2..93068fd5 100644 --- a/k8s/server/netmaker-server.yaml +++ b/k8s/server/netmaker-server.yaml @@ -79,7 +79,7 @@ spec: value: "Kubernetes" - name: VERBOSITY value: "3" - image: gravitl/netmaker:v0.18.8 + image: gravitl/netmaker:v0.19.0 imagePullPolicy: Always name: netmaker ports: diff --git a/k8s/server/netmaker-ui.yaml b/k8s/server/netmaker-ui.yaml index fe1ba7c2..21338664 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.18.8 + image: gravitl/netmaker-ui:v0.19.0 ports: - containerPort: 443 env: diff --git a/main.go b/main.go index b4847260..480d3f30 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ import ( stunserver "github.com/gravitl/netmaker/stun-server" ) -var version = "v0.18.8" +var version = "v0.19.0" // Start DB Connection and start API Request Handler func main() { diff --git a/release.md b/release.md index 08f2dcb9..063c4bd6 100644 --- a/release.md +++ b/release.md @@ -1,4 +1,4 @@ -# Netmaker v0.18.8 +# Netmaker v0.19.0 ## whats new - internet gateways (0.0.0.0/0) for egress diff --git a/scripts/nm-upgrade.sh b/scripts/nm-upgrade.sh index e50f13a8..4e7c70fb 100644 --- a/scripts/nm-upgrade.sh +++ b/scripts/nm-upgrade.sh @@ -1,6 +1,6 @@ #!/bin/bash -LATEST="v0.18.6" +LATEST="v0.19.0" INSTALL_PATH="/root" trap restore_old_netmaker_instructions diff --git a/swagger.yaml b/swagger.yaml index bac543ce..dc4bdbd1 100644 --- a/swagger.yaml +++ b/swagger.yaml @@ -704,7 +704,7 @@ info: API calls must be authenticated via a header of the format -H “Authorization: Bearer ” There are two methods to obtain YOUR_SECRET_KEY: 1. Using the masterkey. By default, this value is “secret key,” but you should change this on your instance and keep it secure. This value can be set via env var at startup or in a config file (config/environments/< env >.yaml). See the [Netmaker](https://docs.netmaker.org/index.html) documentation for more details. 2. Using a JWT received for a node. This can be retrieved by calling the /api/nodes//authenticate endpoint, as documented below. title: Netmaker - version: 0.18.8 + version: 0.19.0 paths: /api/dns: get: