From 64d2a4820ca6fb06f3259f9c64ad5da88afab16d Mon Sep 17 00:00:00 2001 From: Christopher Blaha Date: Wed, 18 Oct 2023 14:51:36 -0400 Subject: [PATCH] update develop (#2633) --- .github/ISSUE_TEMPLATE/bug-report.yml | 1 + README.md | 2 +- compose/docker-compose.netclient.yml | 2 +- controllers/docs.go | 2 +- k8s/client/netclient-daemonset.yaml | 2 +- k8s/client/netclient.yaml | 2 +- k8s/server/netmaker-ui.yaml | 2 +- main.go | 2 +- release.md | 2 +- scripts/nm-upgrade-0-17-1-to-0-19-0.sh | 2 +- swagger.yml | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 107322995..2e8cbe2c5 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.21.2 - v0.21.1 - v0.21.0 - v0.20.6 diff --git a/README.md b/README.md index 7976720b4..074425e9d 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@

- + diff --git a/compose/docker-compose.netclient.yml b/compose/docker-compose.netclient.yml index e0901f84b..5b7425f24 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.21.1' + image: 'gravitl/netclient:v0.21.2' hostname: netmaker-1 network_mode: host restart: on-failure diff --git a/controllers/docs.go b/controllers/docs.go index 491e09039..365708bea 100644 --- a/controllers/docs.go +++ b/controllers/docs.go @@ -10,7 +10,7 @@ // // Schemes: https // BasePath: / -// Version: 0.21.1 +// Version: 0.21.2 // Host: api.demo.netmaker.io // // Consumes: diff --git a/k8s/client/netclient-daemonset.yaml b/k8s/client/netclient-daemonset.yaml index d01612917..c8d5ea5be 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.21.1 + image: gravitl/netclient:v0.21.2 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml index 0152ff960..9fe01dac7 100644 --- a/k8s/client/netclient.yaml +++ b/k8s/client/netclient.yaml @@ -28,7 +28,7 @@ spec: # - "" containers: - name: netclient - image: gravitl/netclient:v0.21.1 + image: gravitl/netclient:v0.21.2 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/server/netmaker-ui.yaml b/k8s/server/netmaker-ui.yaml index bf02d1b01..09f1b87ce 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.21.1 + image: gravitl/netmaker-ui:v0.21.2 ports: - containerPort: 443 env: diff --git a/main.go b/main.go index c93fcb495..0c8ad6465 100644 --- a/main.go +++ b/main.go @@ -28,7 +28,7 @@ import ( "golang.org/x/exp/slog" ) -var version = "v0.21.1" +var version = "v0.21.2" // Start DB Connection and start API Request Handler func main() { diff --git a/release.md b/release.md index 1f4e1b7b5..c1abc08bd 100644 --- a/release.md +++ b/release.md @@ -1,5 +1,5 @@ -# Netmaker v0.21.1 +# Netmaker v0.21.2 ## Whats New - Remote access client session management, refer users section in docs for more details diff --git a/scripts/nm-upgrade-0-17-1-to-0-19-0.sh b/scripts/nm-upgrade-0-17-1-to-0-19-0.sh index 79a78bd5a..b2f090883 100644 --- a/scripts/nm-upgrade-0-17-1-to-0-19-0.sh +++ b/scripts/nm-upgrade-0-17-1-to-0-19-0.sh @@ -1,6 +1,6 @@ #!/bin/bash -LATEST="v0.21.1" +LATEST="v0.21.2" INSTALL_PATH="/root" trap restore_old_netmaker_instructions diff --git a/swagger.yml b/swagger.yml index 2637cdb10..01cbf17d4 100644 --- a/swagger.yml +++ b/swagger.yml @@ -1149,7 +1149,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.21.1 + version: 0.21.2 paths: /api/dns: get: