netbird/management-integrations
0
0
Fork 0
mirror of https://github.com/netbirdio/management-integrations.git synced 2026-05-22 17:09:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/optimize-proxy-network-map

Browse Source 
# Conflicts:
#	integrations/go.mod
#	integrations/go.sum
This commit is contained in:
Pascal Fischer
2025-08-20 17:08:23 +02:00
parent f953fb493f dfc66fa49a
commit 523dd573d0
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integrations/config/config.go
+2 -2
View File
@@ -1,10 +1,10 @@
package config
import (
"github.com/netbirdio/netbird/shared/management/proto"
"github.com/netbirdio/netbird/management/server/types"
"github.com/netbirdio/netbird/shared/management/proto"
)
func ExtendNetBirdConfig(peerID string, config *proto.NetbirdConfig, extraSettings *types.ExtraSettings) *proto.NetbirdConfig {
func ExtendNetBirdConfig(peerID string, peerGroups []string, config *proto.NetbirdConfig, extraSettings *types.ExtraSettings) *proto.NetbirdConfig {
return config
}
integrations/go.mod
+1 -1
View File
@@ -6,7 +6,7 @@ toolchain go1.23.1
require (
github.com/gorilla/mux v1.8.0
github.com/netbirdio/netbird v0.54.1-0.20250811154403-1e72c5b45949
github.com/netbirdio/netbird v0.53.0
github.com/sirupsen/logrus v1.9.3
go.opentelemetry.io/otel/metric v1.26.0
)
integrations/go.sum
+3 -8
View File
@@ -203,12 +203,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/netbirdio/netbird v0.45.2-0.20250529122133-7a9c80ae84a5 h1:aaibHJKCOdafz4S2RsTQescq1Evl9ej4hz0rVEwtqI8=
github.com/netbirdio/netbird v0.45.2-0.20250529122133-7a9c80ae84a5/go.mod h1:YDHTPrpUjb7OyVDiuP0kr9bByhf7kHC25zZiX+KgAtA=
github.com/netbirdio/netbird v0.54.0 h1:sUI8senQnNN9EU/sOeLYhX4qgKq5Hm6zx/ZU3Gy2Okk=
github.com/netbirdio/netbird v0.54.0/go.mod h1:lIdEM9BZtMioqCXKAfYYd/kwQ5EZe09Yj7xP2+cJGws=
github.com/netbirdio/netbird v0.54.1-0.20250811154403-1e72c5b45949 h1:ydI5UfIcqNQaMCVASO5NwuZRDDrmdopoOuDCqDMecNY=
github.com/netbirdio/netbird v0.54.1-0.20250811154403-1e72c5b45949/go.mod h1:lIdEM9BZtMioqCXKAfYYd/kwQ5EZe09Yj7xP2+cJGws=
github.com/netbirdio/netbird v0.53.0 h1:noXn/Wi4cku3b6Pg5OZ+GW7dj0C8lbSMGDsRqMS2H+U=
github.com/netbirdio/netbird v0.53.0/go.mod h1:lIdEM9BZtMioqCXKAfYYd/kwQ5EZe09Yj7xP2+cJGws=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/okta/okta-sdk-golang/v2 v2.18.0 h1:cfDasMb7CShbZvOrF6n+DnLevWwiHgedWMGJ8M8xKDc=
@@ -457,8 +453,7 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=