diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 1fae0eed..67aa5d93 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.2 - v0.16.1 - v0.16.0 - v0.15.2 diff --git a/README.md b/README.md index a6215fa2..9624df1b 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 54ab1590..ece6e38c 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.1-ee + image: gravitl/netmaker:v0.16.2-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.1 + image: gravitl/netmaker-ui:v0.16.2 depends_on: - netmaker links: diff --git a/compose/docker-compose.reference.yml b/compose/docker-compose.reference.yml index 4d9ade40..17438cac 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.1 + image: gravitl/netmaker:v0.16.2 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.1 + image: gravitl/netmaker-ui:v0.16.2 depends_on: - netmaker links: diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index df1a33fa..04c14749 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.1 + image: gravitl/netmaker:v0.16.2 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.1 + image: gravitl/netmaker-ui:v0.16.2 depends_on: - netmaker links: diff --git a/controllers/docs.go b/controllers/docs.go index 018aa5f8..427d4ace 100644 --- a/controllers/docs.go +++ b/controllers/docs.go @@ -10,7 +10,7 @@ // // Schemes: https // BasePath: / -// Version: 0.16.1 +// Version: 0.16.2 // Host: netmaker.io // // Consumes: diff --git a/k8s/client/netclient-daemonset.yaml b/k8s/client/netclient-daemonset.yaml index 9d3a1a7b..b345e054 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.1 + image: gravitl/netclient:v0.16.2 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/client/netclient.yaml b/k8s/client/netclient.yaml index 9cb4a60d..a8097ad2 100644 --- a/k8s/client/netclient.yaml +++ b/k8s/client/netclient.yaml @@ -28,7 +28,7 @@ spec: # - "" containers: - name: netclient - image: gravitl/netclient:v0.16.1 + image: gravitl/netclient:v0.16.2 env: - name: TOKEN value: "TOKEN_VALUE" diff --git a/k8s/server/netmaker-server.yaml b/k8s/server/netmaker-server.yaml index 01ff0e5b..f4820f3b 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.1 + image: gravitl/netmaker:v0.16.2 imagePullPolicy: Always name: netmaker ports: diff --git a/k8s/server/netmaker-ui.yaml b/k8s/server/netmaker-ui.yaml index 0c8c057e..5f80bb63 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.1 + image: gravitl/netmaker-ui:v0.16.2 ports: - containerPort: 443 env: diff --git a/netclient/functions/upgrades/upgrades.go b/netclient/functions/upgrades/upgrades.go index 38f52337..e21e88b2 100644 --- a/netclient/functions/upgrades/upgrades.go +++ b/netclient/functions/upgrades/upgrades.go @@ -7,6 +7,7 @@ func InitializeUpgrades() { upgrade0146, upgrade0160, upgrade0161, + upgrade0162, }) } diff --git a/netclient/functions/upgrades/v0-16-2.go b/netclient/functions/upgrades/v0-16-2.go new file mode 100644 index 00000000..78652670 --- /dev/null +++ b/netclient/functions/upgrades/v0-16-2.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 19c9856c..e23ebdd4 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.1 + version: 0.16.2 paths: /api/dns: get: