Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Master #551

Merged
merged 15 commits into from
Aug 18, 2023
Merged

Master #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3404dbc
update go mod for release
Jun 19, 2023
6eb0e96
v0.20.3 (#488)
github-actions[bot] Jul 3, 2023
b05948e
update go mod for release
Jul 18, 2023
84fd39b
Merge branch 'master' into release-v0.20.4
mattkasun Jul 18, 2023
27c72c1
fix go sum
abhishek9686 Jul 19, 2023
9d0e966
Merge pull request #510 from gravitl/release-v0.20.4
abhishek9686 Jul 19, 2023
00782b1
update go mod for release
Jul 31, 2023
361778b
resolve merge conflicts
abhishek9686 Aug 1, 2023
d2e56f1
Merge pull request #527 from gravitl/release-v0.20.5
abhishek9686 Aug 1, 2023
8c6b6f3
update go mod for release
Aug 16, 2023
057460c
resolve merge conflicts
abhishek9686 Aug 17, 2023
856c1f6
Merge pull request #544 from gravitl/release-v0.20.6
abhishek9686 Aug 17, 2023
40c2ccd
fix sync, update host settings
abhishek9686 Aug 17, 2023
2d45787
Merge pull request #546 from gravitl/pull_fix_v0.20.6
abhishek9686 Aug 17, 2023
09327f9
Merge pull request #547 from gravitl/release-v0.20.6
abhishek9686 Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions functions/mqhandlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ func HostUpdate(client mqtt.Client, msg mqtt.Message) {
clearRetainedMsg(client, msg.Topic()) // clear message
UpdateKeys()
case models.RequestPull:
clearRetainedMsg(client, msg.Topic())
Pull(true)
default:
slog.Error("unknown host action", "action", hostUpdate.Action)
Expand Down
1 change: 1 addition & 0 deletions functions/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ func Pull(restart bool) error {
pullResponse.ServerConfig.MQPassword = server.MQPassword // pwd can't change currently
config.UpdateServerConfig(&pullResponse.ServerConfig)
config.SetNodes(pullResponse.Nodes)
config.UpdateHost(&pullResponse.Host)
fmt.Printf("completed pull for server %s\n", serverName)
_ = config.WriteServerConfig()
_ = config.WriteNetclientConfig()
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/google/nftables v0.1.0
github.com/google/uuid v1.3.0
github.com/gorilla/websocket v1.5.0
github.com/gravitl/netmaker v0.20.6-0.20230809123305-36b444e13a18
github.com/gravitl/netmaker v0.20.6
github.com/gravitl/tcping v0.1.2-0.20230801110928-546055ebde06
github.com/gravitl/txeh v0.0.0-20230509181318-3778c58bd69f
github.com/guumaster/hostctl v1.1.4
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gravitl/netmaker v0.20.6-0.20230809123305-36b444e13a18 h1:nSR9x+f2tBTfy13fBS18zlTz0KXI3RKTrWDnU5ZWGt8=
github.com/gravitl/netmaker v0.20.6-0.20230809123305-36b444e13a18/go.mod h1:OlDRACyy/VRRk2bGHUhoD0eBt5eoUIs6FodIveNRZRM=
github.com/gravitl/netmaker v0.20.6 h1:PrtmKujExojp3xa+Wk3HzoT1bCd5Tbk5BQLQHfdLdEE=
github.com/gravitl/netmaker v0.20.6/go.mod h1:OlDRACyy/VRRk2bGHUhoD0eBt5eoUIs6FodIveNRZRM=
github.com/gravitl/tcping v0.1.2-0.20230801110928-546055ebde06 h1:g2fBXRNT9eiQohyHcoME3SVmeG7OKoJPWrs7A+009kU=
github.com/gravitl/tcping v0.1.2-0.20230801110928-546055ebde06/go.mod h1:12iViYKWAzRPj5/oEGAaD7Wje+Nuz8M9eDJbV7qhKAA=
github.com/gravitl/txeh v0.0.0-20230509181318-3778c58bd69f h1:XzsYovKdrDvj2z2HEHoeHU67+JIEFMHQKHU6oU+1fVE=
Expand Down