Skip to content

Commit

Permalink
Merge pull request #520 from gravitl/feature_v0.9.1_kube
Browse files Browse the repository at this point in the history
Feature v0.9.1 kube
  • Loading branch information
afeiszli authored Nov 29, 2021
2 parents 4a15b02 + dd40a31 commit 13e7621
Show file tree
Hide file tree
Showing 12 changed files with 314 additions and 15 deletions.
15 changes: 10 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<p align="center">
<a href="https://github.com/gravitl/netmaker/releases">
<img src="https://img.shields.io/badge/Version-0.9.0-informational?style=flat-square" />
<img src="https://img.shields.io/badge/Version-0.9.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" />
Expand All @@ -29,9 +29,10 @@

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

# Get Started in 5 Minutes

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

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

- [CoreDNS Plugin](https://github.com/SekoiaLab/netmaker-coredns)
- [CoreDNS Plugin](https://github.com/gravitl/netmaker-coredns-plugin)

- [Multi-Cluster K8S Plugin](https://github.com/gravitl/netmak8s)

- [Terraform Provider](https://github.com/madacluster/netmaker-terraform-provider)


## Disclaimer
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose.caddy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.9.0
image: gravitl/netmaker:v0.9.1
volumes:
- /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
- /run/systemd/system:/run/systemd/system
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose.contained.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.9.0
image: gravitl/netmaker:v0.9.1
volumes:
- dnsconfig:/root/config/dnsconfig
- /usr/bin/wg:/usr/bin/wg
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose.nodns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.4"
services:
netmaker:
container_name: netmaker
image: gravitl/netmaker:v0.9.0
image: gravitl/netmaker:v0.9.1
volumes:
- /usr/bin/wg:/usr/bin/wg
- sqldata:/root/data
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
container_name: netmaker
depends_on:
- rqlite
image: gravitl/netmaker:v0.9.0
image: gravitl/netmaker:v0.9.1
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)
- dnsconfig:/root/config/dnsconfig # Netmaker writes Corefile to this location, which gets mounted by CoreDNS for DNS configuration.
- /usr/bin/wg:/usr/bin/wg
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
author = 'Alex Feiszli'

# The full version, including alpha/beta/rc tags
release = '0.9.0'
release = '0.9.1'


# -- General configuration ---------------------------------------------------
Expand Down
6 changes: 5 additions & 1 deletion netclient/command/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func RunUserspaceDaemon() {

func CheckIn(cfg config.ClientConfig) error {
var err error

var errN error
if cfg.Network == "" {
ncutils.PrintLog("required, '-n', exiting", 0)
os.Exit(1)
Expand Down Expand Up @@ -123,10 +123,14 @@ func CheckIn(cfg config.ClientConfig) error {
daemon.StopWindowsDaemon()
}
}
errN = err
err = nil
} else {
err = functions.CheckConfig(cfg)
}
if err == nil && errN != nil {
err = errN
}
return err
}

Expand Down
2 changes: 1 addition & 1 deletion netclient/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func main() {
app := cli.NewApp()
app.Name = "Netclient CLI"
app.Usage = "Netmaker's netclient agent and CLI. Used to perform interactions with Netmaker server and set local WireGuard config."
app.Version = "v0.9.0"
app.Version = "v0.9.1"

hostname, err := os.Hostname()
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion netclient/netclient.exe.manifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="0.8.5.0"
version="0.9.1.0"
processorArchitecture="*"
name="netclient.exe"
type="win32"
Expand Down
2 changes: 1 addition & 1 deletion netclient/versioninfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"OriginalFilename": "",
"PrivateBuild": "",
"ProductName": "Netclient",
"ProductVersion": "v0.9.0.0",
"ProductVersion": "v0.9.1.0",
"SpecialBuild": ""
},
"VarFileInfo": {
Expand Down
Loading

0 comments on commit 13e7621

Please sign in to comment.