Skip to content

Commit 375b590

Browse files
github-actions[bot]Gravitlabhishek9686
authored
v0.99.0 (#1038)
* update go mod for release * fix build errors --------- Co-authored-by: Gravitl <info@netmaker.io> Co-authored-by: abhishek9686 <abhi281342@gmail.com>
1 parent 1c494ed commit 375b590

File tree

4 files changed

+27
-23
lines changed

4 files changed

+27
-23
lines changed

‎config/node.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func ConvertNode(nodeGet *models.NodeGet) *Node {
177177
node.Action = netmakerNode.Action
178178
node.IsEgressGateway = nodeGet.Node.IsEgressGateway
179179
node.IsIngressGateway = nodeGet.Node.IsIngressGateway
180-
node.DNSOn = nodeGet.Node.DNSOn
180+
//node.DNSOn = nodeGet.Node.DNSOn
181181
// node.Peers = nodeGet.Peers
182182
// add items not provided by server
183183
return &node
@@ -223,7 +223,7 @@ func ConvertToNetmakerNode(node *Node, server *Server, host *Config) *models.Leg
223223
netmakerNode.IsEgressGateway = FormatBool(node.IsEgressGateway)
224224
netmakerNode.IsIngressGateway = FormatBool(node.IsIngressGateway)
225225
netmakerNode.IsStatic = FormatBool(host.IsStatic)
226-
netmakerNode.DNSOn = FormatBool(node.DNSOn)
226+
//netmakerNode.DNSOn = FormatBool(node.DNSOn)
227227

228228
return &netmakerNode
229229
}

‎config/oldconfig.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func ConvertOldNode(netmakerNode *models.LegacyNode) (*Node, *Config) {
152152
node.IsIngressGateway = ParseBool(netmakerNode.IsIngressGateway)
153153
host.IsStaticPort = ParseBool(netmakerNode.IsStatic)
154154
host.IsStatic = ParseBool(netmakerNode.IsStatic)
155-
node.DNSOn = ParseBool(netmakerNode.DNSOn)
155+
//node.DNSOn = ParseBool(netmakerNode.DNSOn)
156156
// node.Peers = nodeGet.Peers
157157
// add items not provided by server
158158
return &node, host

‎go.mod‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ require (
77
github.com/c-robinson/iplib v1.0.8
88
github.com/coreos/go-iptables v0.8.0
99
github.com/devilcove/httpclient v0.6.0
10-
github.com/eclipse/paho.mqtt.golang v1.4.3
10+
github.com/eclipse/paho.mqtt.golang v1.5.0
1111
github.com/glendc/go-external-ip v0.1.0
1212
github.com/go-ping/ping v1.2.0
1313
github.com/golang-jwt/jwt/v4 v4.5.2
1414
github.com/google/nftables v0.3.0
1515
github.com/google/uuid v1.6.0
1616
github.com/gorilla/websocket v1.5.3
17-
github.com/gravitl/netmaker v0.90.1-0.20250504114129-8e60ef15e9dd
17+
github.com/gravitl/netmaker v0.99.0
1818
github.com/gravitl/tcping v0.1.2-0.20230801110928-546055ebde06
1919
github.com/guumaster/hostctl v1.1.4
2020
github.com/hashicorp/go-version v1.7.0
@@ -57,9 +57,10 @@ require (
5757
github.com/go-sql-driver/mysql v1.8.1 // indirect
5858
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
5959
github.com/gogo/protobuf v1.3.2 // indirect
60-
github.com/google/go-cmp v0.6.0 // indirect
60+
github.com/google/go-cmp v0.7.0 // indirect
6161
github.com/goombaio/namegenerator v0.0.0-20181006234301-989e774b106e // indirect
6262
github.com/gorilla/mux v1.8.1 // indirect
63+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
6364
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6465
github.com/jackc/pgpassfile v1.0.0 // indirect
6566
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
@@ -70,7 +71,7 @@ require (
7071
github.com/kr/text v0.2.0 // indirect
7172
github.com/leodido/go-urn v1.4.0 // indirect
7273
github.com/lib/pq v1.10.9 // indirect
73-
github.com/mattn/go-sqlite3 v1.14.24 // indirect
74+
github.com/mattn/go-sqlite3 v1.14.28 // indirect
7475
github.com/mdlayher/genetlink v1.2.0 // indirect
7576
github.com/mdlayher/netlink v1.7.3-0.20250113171957-fbb4dce95f42 // indirect
7677
github.com/mdlayher/socket v0.5.1 // indirect
@@ -80,7 +81,7 @@ require (
8081
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
8182
github.com/pkg/errors v0.9.1 // indirect
8283
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
83-
github.com/posthog/posthog-go v1.2.24 // indirect
84+
github.com/posthog/posthog-go v1.5.5 // indirect
8485
github.com/rivo/uniseg v0.4.6 // indirect
8586
github.com/rogpeppe/go-internal v1.14.1 // indirect
8687
github.com/rqlite/gorqlite v0.0.0-20240122221808-a8a425b1a6aa // indirect
@@ -99,12 +100,13 @@ require (
99100
golang.org/x/mod v0.24.0 // indirect
100101
golang.org/x/sync v0.14.0 // indirect
101102
golang.org/x/text v0.25.0 // indirect
103+
golang.org/x/time v0.11.0 // indirect
102104
golang.org/x/tools v0.32.0 // indirect
103105
golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect
104106
gopkg.in/yaml.v2 v2.4.0 // indirect
105107
gorm.io/datatypes v1.2.5 // indirect
106108
gorm.io/driver/mysql v1.5.6 // indirect
107109
gorm.io/driver/postgres v1.5.11 // indirect
108110
gorm.io/driver/sqlite v1.5.7 // indirect
109-
gorm.io/gorm v1.25.12 // indirect
111+
gorm.io/gorm v1.30.0 // indirect
110112
)

‎go.sum‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKoh
2828
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
2929
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
3030
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
31-
github.com/eclipse/paho.mqtt.golang v1.4.3 h1:2kwcUGn8seMUfWndX0hGbvH8r7crgcJguQNCyp70xik=
32-
github.com/eclipse/paho.mqtt.golang v1.4.3/go.mod h1:CSYvoAlsMkhYOXh/oKyxa8EcBci6dVkLCbo5tTC1RIE=
31+
github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o=
32+
github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk=
3333
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
3434
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
3535
github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
@@ -63,8 +63,8 @@ github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei
6363
github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
6464
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
6565
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
66-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
67-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
66+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
67+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
6868
github.com/google/nftables v0.3.0 h1:bkyZ0cbpVeMHXOrtlFc8ISmfVqq5gPJukoYieyVmITg=
6969
github.com/google/nftables v0.3.0/go.mod h1:BCp9FsrbF1Fn/Yu6CLUc9GGZFw/+hsxfluNXXmxBfRM=
7070
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -78,8 +78,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
7878
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
7979
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
8080
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
81-
github.com/gravitl/netmaker v0.90.1-0.20250504114129-8e60ef15e9dd h1:B0012QqRrI0Stn3kT57hbLdmwxJSQ6wbCLxqPmrCthg=
82-
github.com/gravitl/netmaker v0.90.1-0.20250504114129-8e60ef15e9dd/go.mod h1:de1LxQqJ7XovGugzcx20T0QhrmYqdRZGCOVF7Vclkro=
81+
github.com/gravitl/netmaker v0.99.0 h1:SeXhaPRo/sJ0gWZ+kdm9sb5f7Mr9i59GhOk3qFDEl0U=
82+
github.com/gravitl/netmaker v0.99.0/go.mod h1:7A5VpQxL5dksd/Cp54HZKkFYTpEB86NwH6gEvUK8orA=
8383
github.com/gravitl/tcping v0.1.2-0.20230801110928-546055ebde06 h1:g2fBXRNT9eiQohyHcoME3SVmeG7OKoJPWrs7A+009kU=
8484
github.com/gravitl/tcping v0.1.2-0.20230801110928-546055ebde06/go.mod h1:12iViYKWAzRPj5/oEGAaD7Wje+Nuz8M9eDJbV7qhKAA=
8585
github.com/guumaster/hostctl v1.1.4 h1:4zb9wEurBlz/hQiXFz9feHHfunf7oj+9serAH8ohGuM=
@@ -88,6 +88,8 @@ github.com/guumaster/tablewriter v0.0.10 h1:A0HD94yMdt4usgxBjoEceNeE0XMJ027euoHA
8888
github.com/guumaster/tablewriter v0.0.10/go.mod h1:p4FRFhyfo0UD9ZLmMRbbJooTUsxo6b80qZTERVDWrH8=
8989
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
9090
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
91+
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
92+
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
9193
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
9294
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
9395
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
@@ -119,8 +121,8 @@ github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ=
119121
github.com/matryer/is v1.4.1/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
120122
github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
121123
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
122-
github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
123-
github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
124+
github.com/mattn/go-sqlite3 v1.14.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A=
125+
github.com/mattn/go-sqlite3 v1.14.28/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
124126
github.com/mdlayher/genetlink v1.2.0 h1:4yrIkRV5Wfk1WfpWTcoOlGmsWgQj3OtQN9ZsbrE+XtU=
125127
github.com/mdlayher/genetlink v1.2.0/go.mod h1:ra5LDov2KrUCZJiAtEvXXZBxGMInICMXIwshlJ+qRxQ=
126128
github.com/mdlayher/netlink v1.6.0/go.mod h1:0o3PlBmGst1xve7wQ7j/hwpNaFaH4qCRyWCdcZk8/vA=
@@ -155,8 +157,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
155157
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
156158
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
157159
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
158-
github.com/posthog/posthog-go v1.2.24 h1:A+iG4saBJemo++VDlcWovbYf8KFFNUfrCoJtsc40RPA=
159-
github.com/posthog/posthog-go v1.2.24/go.mod h1:uYC2l1Yktc8E+9FAHJ9QZG4vQf/NHJPD800Hsm7DzoM=
160+
github.com/posthog/posthog-go v1.5.5 h1:2o3j7IrHbTIfxRtj4MPaXKeimuTYg49onNzNBZbwksM=
161+
github.com/posthog/posthog-go v1.5.5/go.mod h1:3RqUmSnPuwmeVj/GYrS75wNGqcAKdpODiwc83xZWgdE=
160162
github.com/rivo/uniseg v0.4.6 h1:Sovz9sDSwbOz9tgUy8JpT+KgCkPYJEN/oYzlJiYTNLg=
161163
github.com/rivo/uniseg v0.4.6/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
162164
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
@@ -265,8 +267,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
265267
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
266268
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
267269
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
268-
golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
269-
golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
270+
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
271+
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
270272
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
271273
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
272274
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -304,8 +306,8 @@ gorm.io/driver/sqlite v1.5.7/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDa
304306
gorm.io/driver/sqlserver v1.5.4 h1:xA+Y1KDNspv79q43bPyjDMUgHoYHLhXYmdFcYPobg8g=
305307
gorm.io/driver/sqlserver v1.5.4/go.mod h1:+frZ/qYmuna11zHPlh5oc2O6ZA/lS88Keb0XSH1Zh/g=
306308
gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
307-
gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
308-
gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
309+
gorm.io/gorm v1.30.0 h1:qbT5aPv1UH8gI99OsRlvDToLxW5zR7FzS9acZDOZcgs=
310+
gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE=
309311
gortc.io/stun v1.23.0 h1:CpRQFjakCZMwVKTwInKbcCzlBklj62LGzD3NPdFyGrE=
310312
gortc.io/stun v1.23.0/go.mod h1:XD5lpONVyjvV3BgOyJFNo0iv6R2oZB4L+weMqxts+zg=
311313
gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=

0 commit comments

Comments
 (0)