From 6a6c55c21abc190b8f4e3b05e9e91151faf51638 Mon Sep 17 00:00:00 2001 From: Christopher Blaha Date: Mon, 11 Dec 2023 11:01:31 -0500 Subject: [PATCH] update develop (#2725) --- .github/ISSUE_TEMPLATE/bug-report.yml | 2 +- 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(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 69073a5f..9cf102cc 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.21.3 + - v0.22.0 - v0.21.2 - v0.21.1 - v0.21.0 diff --git a/README.md b/README.md index 141fdb49..12f2b649 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 809cc297..0a5b3c5e 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.3' + image: 'gravitl/netclient:v0.22.0' hostname: netmaker-1 network_mode: host restart: on-failure diff --git a/controllers/docs.go b/controllers/docs.go index 58f9c272..f473031a 100644 --- a/controllers/docs.go +++ b/controllers/docs.go @@ -10,7 +10,7 @@ // // Schemes: https // BasePath: / -// Version: 0.21.3 +// Version: 0.22.0 // Host: api.demo.netmaker.io // // Consumes: diff --git a/k8s/client/netclient-daemonset.yaml b/k8s/client/netclient-daemonset.yaml index d83847cf..abaf8b4d 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.3 + image: gravitl/netclient:v0.22.0 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml index 11bbe673..8ac0a648 100644 --- a/k8s/client/netclient.yaml +++ b/k8s/client/netclient.yaml @@ -28,7 +28,7 @@ spec: # - "" containers: - name: netclient - image: gravitl/netclient:v0.21.3 + image: gravitl/netclient:v0.22.0 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/server/netmaker-ui.yaml b/k8s/server/netmaker-ui.yaml index db09e162..c71c1c26 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.3 + image: gravitl/netmaker-ui:v0.22.0 ports: - containerPort: 443 env: diff --git a/main.go b/main.go index efd30a33..b8b9be7a 100644 --- a/main.go +++ b/main.go @@ -28,7 +28,7 @@ import ( "golang.org/x/exp/slog" ) -var version = "v0.21.3" +var version = "v0.22.0" // Start DB Connection and start API Request Handler func main() { diff --git a/release.md b/release.md index 42cc85dd..481640d6 100644 --- a/release.md +++ b/release.md @@ -1,5 +1,5 @@ -# Netmaker v0.21.3 +# Netmaker v0.22.0 ## Whats New - Auto Relay via Enrollment key 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 305c7adf..7ece935f 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.3" +LATEST="v0.21.0" INSTALL_PATH="/root" trap restore_old_netmaker_instructions diff --git a/swagger.yml b/swagger.yml index e0850da3..b2acbdd9 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.3 + version: 0.22.0 paths: /api/dns: get: