Merge branch 'develop' into NET-591

gravitl · Sep 12, 2023 · 44613d6 · 44613d6
2 parents 591782b + 5074e56
commit 44613d6
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git 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.1
         - v0.21.0
         - v0.20.6
         - v0.20.5

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@
 
 <p align="center">
   <a href="https://github.com/gravitl/netmaker/releases">
-    <img src="https://img.shields.io/badge/Version-0.21.0-informational?style=flat-square" />
+    <img src="https://img.shields.io/badge/Version-0.21.1-informational?style=flat-square" />
   </a>
   <a href="https://hub.docker.com/r/gravitl/netmaker/tags">
     <img src="https://img.shields.io/docker/pulls/gravitl/netmaker?label=downloads" />

diff --git 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.0'
+    image: 'gravitl/netclient:v0.21.1'
     hostname: netmaker-1
     network_mode: host
     restart: on-failure

diff --git a/controllers/docs.go b/controllers/docs.go
@@ -10,7 +10,7 @@
 //
 //	Schemes: https
 //	BasePath: /
-//	Version: 0.21.0
+//	Version: 0.21.1
 //	Host: netmaker.io
 //
 //	Consumes:

diff --git 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.0
+        image: gravitl/netclient:v0.21.1
         env:
         - name: TOKEN
           value: "TOKEN_VALUE"

diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml
@@ -28,7 +28,7 @@ spec:
       #           - "<node label value>"
       containers:
       - name: netclient
-        image: gravitl/netclient:v0.21.0
+        image: gravitl/netclient:v0.21.1
         env:
         - name: TOKEN
           value: "TOKEN_VALUE"

diff --git 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.0
+        image: gravitl/netmaker-ui:v0.21.1
         ports:
         - containerPort: 443
         env:

diff --git a/main.go b/main.go
@@ -28,7 +28,7 @@ import (
 	"golang.org/x/exp/slog"
 )
 
-var version = "v0.21.0"
+var version = "v0.21.1"
 
 // Start DB Connection and start API Request Handler
 func main() {

diff --git a/release.md b/release.md
@@ -1,5 +1,5 @@
 
-# Netmaker v0.21.0
+# Netmaker v0.21.1
 
 ## Whats New
 - New User Management, Refer Docs For More Info

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
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LATEST="v0.21.0"
+LATEST="v0.21.1"
 INSTALL_PATH="/root"
 
 trap restore_old_netmaker_instructions
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,7 @@ body: @@
           label: Version
           description: What version are you running?
           options:
+            - v0.21.1
             - v0.21.0
             - v0.20.6
             - v0.20.5
@@ Expand Down @@