mirror of
				https://github.com/gravitl/netmaker.git
				synced 2025-10-31 12:16:29 +08:00 
			
		
		
		
	Merge branch 'develop' of https://github.com/gravitl/netmaker into NET-1615
This commit is contained in:
		
							
								
								
									
										1
									
								
								.github/ISSUE_TEMPLATE/bug-report.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/ISSUE_TEMPLATE/bug-report.yml
									
									
									
									
										vendored
									
									
								
							| @@ -31,6 +31,7 @@ body: | ||||
|       label: Version | ||||
|       description: What version are you running? | ||||
|       options: | ||||
|         - v0.26.0 | ||||
|         - v0.25.0 | ||||
|         - v0.24.3 | ||||
|         - v0.24.2 | ||||
|   | ||||
| @@ -16,7 +16,7 @@ | ||||
|  | ||||
| <p align="center"> | ||||
|   <a href="https://github.com/gravitl/netmaker/releases"> | ||||
|     <img src="https://img.shields.io/badge/Version-0.25.0-informational?style=flat-square" /> | ||||
|     <img src="https://img.shields.io/badge/Version-0.26.0-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" /> | ||||
|   | ||||
| @@ -3,7 +3,7 @@ version: "3.4" | ||||
| services: | ||||
|   netclient: | ||||
|     container_name: netclient | ||||
|     image: 'gravitl/netclient:v0.25.0' | ||||
|     image: 'gravitl/netclient:v0.26.0' | ||||
|     hostname: netmaker-1 | ||||
|     network_mode: host | ||||
|     restart: on-failure | ||||
|   | ||||
| @@ -16,7 +16,7 @@ spec: | ||||
|       hostNetwork: true | ||||
|       containers: | ||||
|       - name: netclient | ||||
|         image: gravitl/netclient:v0.25.0 | ||||
|         image: gravitl/netclient:v0.26.0 | ||||
|         env: | ||||
|         - name: TOKEN | ||||
|           value: "TOKEN_VALUE" | ||||
|   | ||||
| @@ -28,7 +28,7 @@ spec: | ||||
|       #           - "<node label value>" | ||||
|       containers: | ||||
|       - name: netclient | ||||
|         image: gravitl/netclient:v0.25.0 | ||||
|         image: gravitl/netclient:v0.26.0 | ||||
|         env: | ||||
|         - name: TOKEN | ||||
|           value: "TOKEN_VALUE" | ||||
|   | ||||
| @@ -15,7 +15,7 @@ spec: | ||||
|     spec: | ||||
|       containers: | ||||
|       - name: netmaker-ui | ||||
|         image: gravitl/netmaker-ui:v0.25.0 | ||||
|         image: gravitl/netmaker-ui:v0.26.0 | ||||
|         ports: | ||||
|         - containerPort: 443 | ||||
|         env: | ||||
|   | ||||
							
								
								
									
										4
									
								
								main.go
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								main.go
									
									
									
									
									
								
							| @@ -27,10 +27,10 @@ import ( | ||||
| 	"golang.org/x/exp/slog" | ||||
| ) | ||||
|  | ||||
| var version = "v0.25.0" | ||||
| var version = "v0.26.0" | ||||
|  | ||||
| //	@title			NetMaker | ||||
| //	@version		0.24.3 | ||||
| //	@version		0.26.0 | ||||
| //	@description	NetMaker API Docs | ||||
| //	@tag.name	    APIUsage | ||||
| //	@tag.description.markdown | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| # Netmaker v0.25.0 | ||||
| # Netmaker v0.26.0 | ||||
|  | ||||
| ## Whats New ✨ | ||||
| - Advanced User Management with Network Roles and Groups | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 abhishek9686
					abhishek9686