diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 4b4ff3ed..1fae0eed 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.16.1 - v0.16.0 - v0.15.2 - v0.15.1 diff --git a/README.md b/README.md index 94695d9e..a6215fa2 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@

- + diff --git a/compose/docker-compose.ee.yml b/compose/docker-compose.ee.yml index d9f3216d..54ab1590 100644 --- a/compose/docker-compose.ee.yml +++ b/compose/docker-compose.ee.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: container_name: netmaker - image: gravitl/netmaker:v0.16.0-ee + image: gravitl/netmaker:v0.16.1-ee cap_add: - NET_ADMIN - NET_RAW @@ -55,7 +55,7 @@ services: - traefik.http.services.netmaker-api.loadbalancer.server.port=8081 netmaker-ui: container_name: netmaker-ui - image: gravitl/netmaker-ui:v0.16.0 + image: gravitl/netmaker-ui:v0.16.1 depends_on: - netmaker links: diff --git a/compose/docker-compose.reference.yml b/compose/docker-compose.reference.yml index e7db2ccd..4d9ade40 100644 --- a/compose/docker-compose.reference.yml +++ b/compose/docker-compose.reference.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: # The Primary Server for running Netmaker container_name: netmaker - image: gravitl/netmaker:v0.16.0 + image: gravitl/netmaker:v0.16.1 cap_add: - NET_ADMIN - NET_RAW @@ -62,7 +62,7 @@ services: - traefik.http.services.netmaker-api.loadbalancer.server.port=8081 netmaker-ui: # The Netmaker UI Component container_name: netmaker-ui - image: gravitl/netmaker-ui:v0.16.0 + image: gravitl/netmaker-ui:v0.16.1 depends_on: - netmaker links: diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index f8b0e92f..df1a33fa 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.4" services: netmaker: container_name: netmaker - image: gravitl/netmaker:v0.16.0 + image: gravitl/netmaker:v0.16.1 cap_add: - NET_ADMIN - NET_RAW @@ -52,7 +52,7 @@ services: - traefik.http.services.netmaker-api.loadbalancer.server.port=8081 netmaker-ui: container_name: netmaker-ui - image: gravitl/netmaker-ui:v0.16.0 + image: gravitl/netmaker-ui:v0.16.1 depends_on: - netmaker links: diff --git a/controllers/docs.go b/controllers/docs.go index ed165206..018aa5f8 100644 --- a/controllers/docs.go +++ b/controllers/docs.go @@ -1,27 +1,26 @@ -//Package classification Netmaker +// Package classification Netmaker // -// API Usage +// # API Usage // // Most actions that can be performed via API can be performed via UI. We recommend managing your networks using the official netmaker-ui project. However, Netmaker can also be run without the UI, and all functions can be achieved via API calls. If your use case requires using Netmaker without the UI or you need to do some troubleshooting/advanced configuration, using the API directly may help. // -// -// Authentication +// # Authentication // // 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. // -// Schemes: https -// BasePath: / -// Version: 0.16.0 -// Host: netmaker.io +// Schemes: https +// BasePath: / +// Version: 0.16.1 +// Host: netmaker.io // -// Consumes: -// - application/json +// Consumes: +// - application/json // -// Produces: -// - application/json +// Produces: +// - application/json // -// Security: -// - oauth +// Security: +// - oauth // // swagger:meta package controller @@ -310,7 +309,7 @@ type registerRequestBodyParam struct { RegisterRequest config.RegisterRequest `json:"register_request"` } -// swagger:response registerResponse +// swagger:response registerResponse type registerResponse struct { // Register Response // in: body diff --git a/k8s/client/netclient-daemonset.yaml b/k8s/client/netclient-daemonset.yaml index f8dbde1d..9d3a1a7b 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.16.0 + image: gravitl/netclient:v0.16.1 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml index f95a0ff1..9cb4a60d 100644 --- a/k8s/client/netclient.yaml +++ b/k8s/client/netclient.yaml @@ -28,7 +28,7 @@ spec: # - "" containers: - name: netclient - image: gravitl/netclient:v0.16.0 + image: gravitl/netclient:v0.16.1 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/server/netmaker-server.yaml b/k8s/server/netmaker-server.yaml index 61c1d866..01ff0e5b 100644 --- a/k8s/server/netmaker-server.yaml +++ b/k8s/server/netmaker-server.yaml @@ -83,7 +83,7 @@ spec: value: "Kubernetes" - name: VERBOSITY value: "3" - image: gravitl/netmaker:v0.16.0 + image: gravitl/netmaker:v0.16.1 imagePullPolicy: Always name: netmaker ports: diff --git a/k8s/server/netmaker-ui.yaml b/k8s/server/netmaker-ui.yaml index 240f9a82..0c8c057e 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.16.0 + image: gravitl/netmaker-ui:v0.16.1 ports: - containerPort: 443 env: diff --git a/netclient/functions/upgrades/upgrades.go b/netclient/functions/upgrades/upgrades.go index ffdf9cfc..38f52337 100644 --- a/netclient/functions/upgrades/upgrades.go +++ b/netclient/functions/upgrades/upgrades.go @@ -6,6 +6,7 @@ func InitializeUpgrades() { upgrade0145, upgrade0146, upgrade0160, + upgrade0161, }) } diff --git a/netclient/functions/upgrades/v0-16-1.go b/netclient/functions/upgrades/v0-16-1.go new file mode 100644 index 00000000..78652670 --- /dev/null +++ b/netclient/functions/upgrades/v0-16-1.go @@ -0,0 +1,24 @@ +package upgrades + +import ( + "github.com/gravitl/netmaker/netclient/config" +) + +var upgrade0161 = UpgradeInfo{ + RequiredVersions: []string{ + "v0.14.6", + "v0.15.0", + "v0.15.1", + "v0.15.2", + "v0.16.1", + }, + NewVersion: "v0.16.1", + OP: update0161, +} + +func update0161(cfg *config.ClientConfig) { + // set connect default if not present 15.X -> 16.0 + if cfg.Node.Connected == "" { + cfg.Node.SetDefaultConnected() + } +} diff --git a/netclient/netclient.exe.manifest.xml b/netclient/netclient.exe.manifest.xml index 01fb0d9d..19c9856c 100644 --- a/netclient/netclient.exe.manifest.xml +++ b/netclient/netclient.exe.manifest.xml @@ -1,7 +1,7 @@ ” 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.16.0 + version: 0.16.1 paths: /api/dns: get: