Skip to content

Commit 13e7621

Browse files
authored
Merge pull request #520 from gravitl/feature_v0.9.1_kube
Feature v0.9.1 kube
2 parents 4a15b02 + dd40a31 commit 13e7621

File tree

12 files changed

+314
-15
lines changed

12 files changed

+314
-15
lines changed

README.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<p align="center">
1010
<a href="https://github.com/gravitl/netmaker/releases">
11-
<img src="https://img.shields.io/badge/Version-0.9.0-informational?style=flat-square" />
11+
<img src="https://img.shields.io/badge/Version-0.9.1-informational?style=flat-square" />
1212
</a>
1313
<a href="https://hub.docker.com/r/gravitl/netmaker/tags">
1414
<img src="https://img.shields.io/docker/pulls/gravitl/netmaker" />
@@ -29,9 +29,10 @@
2929

3030
# WireGuard® Automation from Homelab to Enterprise
3131
- [x] Peer-to-Peer Mesh Networks
32-
- [x] Kubernetes, Multi-Cloud
33-
- [x] OAuth and Private DNS
34-
- [x] Linux, Mac, Windows, FreeBSD, iPhone, and Android
32+
- [x] Kubernetes and Multi-Cloud Enablement
33+
- [x] Remote Site Access via Gateway
34+
- [x] OAuth and Private DNS Features
35+
- [x] Support for Linux, Mac, Windows, FreeBSD, iPhone, and Android
3536

3637
# Get Started in 5 Minutes
3738

@@ -96,7 +97,11 @@ After installing Netmaker, check out the [Walkthrough](https://itnext.io/getting
9697

9798
- [Golang GUI](https://github.com/mattkasun/netmaker-gui)
9899

99-
- [CoreDNS Plugin](https://github.com/SekoiaLab/netmaker-coredns)
100+
- [CoreDNS Plugin](https://github.com/gravitl/netmaker-coredns-plugin)
101+
102+
- [Multi-Cluster K8S Plugin](https://github.com/gravitl/netmak8s)
103+
104+
- [Terraform Provider](https://github.com/madacluster/netmaker-terraform-provider)
100105

101106

102107
## Disclaimer

compose/docker-compose.caddy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.4"
33
services:
44
netmaker:
55
container_name: netmaker
6-
image: gravitl/netmaker:v0.9.0
6+
image: gravitl/netmaker:v0.9.1
77
volumes:
88
- /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
99
- /run/systemd/system:/run/systemd/system

compose/docker-compose.contained.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.4"
33
services:
44
netmaker:
55
container_name: netmaker
6-
image: gravitl/netmaker:v0.9.0
6+
image: gravitl/netmaker:v0.9.1
77
volumes:
88
- dnsconfig:/root/config/dnsconfig
99
- /usr/bin/wg:/usr/bin/wg

compose/docker-compose.nodns.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.4"
33
services:
44
netmaker:
55
container_name: netmaker
6-
image: gravitl/netmaker:v0.9.0
6+
image: gravitl/netmaker:v0.9.1
77
volumes:
88
- /usr/bin/wg:/usr/bin/wg
99
- sqldata:/root/data

compose/docker-compose.reference.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
container_name: netmaker
1212
depends_on:
1313
- rqlite
14-
image: gravitl/netmaker:v0.9.0
14+
image: gravitl/netmaker:v0.9.1
1515
volumes: # Volume mounts necessary for CLIENT_MODE to control wireguard networking on host (except dnsconfig, which is where dns config files are stored for use by CoreDNS)
1616
- dnsconfig:/root/config/dnsconfig # Netmaker writes Corefile to this location, which gets mounted by CoreDNS for DNS configuration.
1717
- /usr/bin/wg:/usr/bin/wg

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
author = 'Alex Feiszli'
2323

2424
# The full version, including alpha/beta/rc tags
25-
release = '0.9.0'
25+
release = '0.9.1'
2626

2727

2828
# -- General configuration ---------------------------------------------------

netclient/command/commands.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func RunUserspaceDaemon() {
9595

9696
func CheckIn(cfg config.ClientConfig) error {
9797
var err error
98-
98+
var errN error
9999
if cfg.Network == "" {
100100
ncutils.PrintLog("required, '-n', exiting", 0)
101101
os.Exit(1)
@@ -123,10 +123,14 @@ func CheckIn(cfg config.ClientConfig) error {
123123
daemon.StopWindowsDaemon()
124124
}
125125
}
126+
errN = err
126127
err = nil
127128
} else {
128129
err = functions.CheckConfig(cfg)
129130
}
131+
if err == nil && errN != nil {
132+
err = errN
133+
}
130134
return err
131135
}
132136

netclient/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func main() {
2424
app := cli.NewApp()
2525
app.Name = "Netclient CLI"
2626
app.Usage = "Netmaker's netclient agent and CLI. Used to perform interactions with Netmaker server and set local WireGuard config."
27-
app.Version = "v0.9.0"
27+
app.Version = "v0.9.1"
2828

2929
hostname, err := os.Hostname()
3030
if err != nil {

netclient/netclient.exe.manifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
33
<assemblyIdentity
4-
version="0.8.5.0"
4+
version="0.9.1.0"
55
processorArchitecture="*"
66
name="netclient.exe"
77
type="win32"

netclient/versioninfo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"OriginalFilename": "",
3030
"PrivateBuild": "",
3131
"ProductName": "Netclient",
32-
"ProductVersion": "v0.9.0.0",
32+
"ProductVersion": "v0.9.1.0",
3333
"SpecialBuild": ""
3434
},
3535
"VarFileInfo": {

0 commit comments

Comments
 (0)