Skip to content

Commit 94070a3

Browse files
committed
config(wiring): pass Manager/Scheduler auth.jwt.key into gRPC server via auth registry
Signed-off-by: sabarixr <[email protected]>
1 parent 0bd8a5e commit 94070a3

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

manager/rpcserver/rpcserver.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"d7y.io/dragonfly/v2/manager/database"
2727
"d7y.io/dragonfly/v2/manager/models"
2828
"d7y.io/dragonfly/v2/manager/searcher"
29+
"d7y.io/dragonfly/v2/pkg/rpc/auth"
2930
managerserver "d7y.io/dragonfly/v2/pkg/rpc/manager/server"
3031
)
3132

@@ -59,6 +60,8 @@ func New(
5960
searcher: searcher,
6061
}
6162

63+
// Provide JWT key from config to manager server via auth package.
64+
auth.SetServerKey("manager", cfg.Auth.JWT.Key)
6265
return s, managerserver.New(
6366
newManagerServerV1(s.config, database, s.cache, s.searcher),
6467
newManagerServerV2(s.config, database, s.cache, s.searcher),

scheduler/rpcserver/rpcserver.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package rpcserver
1919
import (
2020
"google.golang.org/grpc"
2121

22+
"d7y.io/dragonfly/v2/pkg/rpc/auth"
2223
"d7y.io/dragonfly/v2/pkg/rpc/scheduler/server"
2324
"d7y.io/dragonfly/v2/scheduler/config"
2425
"d7y.io/dragonfly/v2/scheduler/job"
@@ -39,6 +40,8 @@ func New(
3940
dynconfig config.DynconfigInterface,
4041
opts ...grpc.ServerOption,
4142
) *grpc.Server {
43+
// Provide JWT key from config to scheduler server via auth package.
44+
auth.SetServerKey("scheduler", cfg.Auth.JWT.Key)
4245
return server.New(
4346
newSchedulerServerV1(cfg, resource, scheduling, dynconfig),
4447
newSchedulerServerV2(cfg, resource, persistentResource, persistentCacheResource, scheduling, job, dynconfig),

0 commit comments

Comments
 (0)