Skip to content

Commit aeb13bc

Browse files
COLDTURNIPderekbit
authored andcommitted
fix(grpc): disable grpc service discovery to prevent dns flooding
longhorn-12521 Signed-off-by: Raphanus Lo <yunchang.lo@suse.com>
1 parent 979d4e9 commit aeb13bc

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

pkg/client/manager_client.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ func (cli *BackingImageManagerClient) Sync(name, uuid, checksum, fromAddress str
3636
cli.Address,
3737
grpc.WithTransportCredentials(insecure.NewCredentials()),
3838
grpc.WithNoProxy(),
39+
grpc.WithDisableServiceConfig(),
3940
)
4041
if err != nil {
4142
return nil, fmt.Errorf("cannot connect backing image manager service to %v: %v", cli.Address, err)
@@ -74,6 +75,7 @@ func (cli *BackingImageManagerClient) Send(name, uuid, toAddress string) error {
7475
cli.Address,
7576
grpc.WithTransportCredentials(insecure.NewCredentials()),
7677
grpc.WithNoProxy(),
78+
grpc.WithDisableServiceConfig(),
7779
)
7880
if err != nil {
7981
return fmt.Errorf("cannot connect backing image manager service to %v: %v", cli.Address, err)
@@ -105,6 +107,7 @@ func (cli *BackingImageManagerClient) Delete(name, uuid string) error {
105107
cli.Address,
106108
grpc.WithTransportCredentials(insecure.NewCredentials()),
107109
grpc.WithNoProxy(),
110+
grpc.WithDisableServiceConfig(),
108111
)
109112
if err != nil {
110113
return fmt.Errorf("cannot connect backing image manager service to %v: %v", cli.Address, err)
@@ -135,6 +138,7 @@ func (cli *BackingImageManagerClient) Get(name, uuid string) (*api.BackingImage,
135138
cli.Address,
136139
grpc.WithTransportCredentials(insecure.NewCredentials()),
137140
grpc.WithNoProxy(),
141+
grpc.WithDisableServiceConfig(),
138142
)
139143
if err != nil {
140144
return nil, fmt.Errorf("cannot connect backing image manager service to %v: %v", cli.Address, err)
@@ -164,6 +168,7 @@ func (cli *BackingImageManagerClient) List() (map[string]*api.BackingImage, erro
164168
cli.Address,
165169
grpc.WithTransportCredentials(insecure.NewCredentials()),
166170
grpc.WithNoProxy(),
171+
grpc.WithDisableServiceConfig(),
167172
)
168173
if err != nil {
169174
return nil, fmt.Errorf("cannot connect backing image manager service to %v: %v", cli.Address, err)
@@ -194,6 +199,7 @@ func (cli *BackingImageManagerClient) Fetch(name, uuid, checksum, dataSourceAddr
194199
cli.Address,
195200
grpc.WithTransportCredentials(insecure.NewCredentials()),
196201
grpc.WithNoProxy(),
202+
grpc.WithDisableServiceConfig(),
197203
)
198204
if err != nil {
199205
return nil, fmt.Errorf("cannot connect backing image manager service to %v: %v", cli.Address, err)
@@ -232,6 +238,7 @@ func (cli *BackingImageManagerClient) PrepareDownload(name, uuid string) (string
232238
cli.Address,
233239
grpc.WithTransportCredentials(insecure.NewCredentials()),
234240
grpc.WithNoProxy(),
241+
grpc.WithDisableServiceConfig(),
235242
)
236243
if err != nil {
237244
return "", "", fmt.Errorf("cannot connect backing image manager service to %v: %v", cli.Address, err)
@@ -261,6 +268,7 @@ func (cli *BackingImageManagerClient) VersionGet() (*meta.VersionOutput, error)
261268
cli.Address,
262269
grpc.WithTransportCredentials(insecure.NewCredentials()),
263270
grpc.WithNoProxy(),
271+
grpc.WithDisableServiceConfig(),
264272
)
265273
if err != nil {
266274
return nil, fmt.Errorf("cannot connect backing image manager service to %v: %v", cli.Address, err)
@@ -294,6 +302,7 @@ func (cli *BackingImageManagerClient) Watch() (*api.BackingImageStream, error) {
294302
cli.Address,
295303
grpc.WithTransportCredentials(insecure.NewCredentials()),
296304
grpc.WithNoProxy(),
305+
grpc.WithDisableServiceConfig(),
297306
)
298307
if err != nil {
299308
return nil, fmt.Errorf("cannot connect backing image manager service to %v: %v", cli.Address, err)
@@ -321,6 +330,7 @@ func (cli *BackingImageManagerClient) BackupCreate(name, uuid, checksum, backupT
321330
cli.Address,
322331
grpc.WithTransportCredentials(insecure.NewCredentials()),
323332
grpc.WithNoProxy(),
333+
grpc.WithDisableServiceConfig(),
324334
)
325335
if err != nil {
326336
return fmt.Errorf("failed to connect backing image manager service to %v: %v", cli.Address, err)
@@ -363,6 +373,7 @@ func (cli *BackingImageManagerClient) BackupStatus(name string) (*api.BackupStat
363373
cli.Address,
364374
grpc.WithTransportCredentials(insecure.NewCredentials()),
365375
grpc.WithNoProxy(),
376+
grpc.WithDisableServiceConfig(),
366377
)
367378
if err != nil {
368379
return nil, fmt.Errorf("failed to connect backing image manager service to %v: %v", cli.Address, err)

pkg/util/util.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ func DetectGRPCServerAvailability(address string, waitIntervalInSecond int, shou
108108
grpc.WithTransportCredentials(insecure.NewCredentials()),
109109
grpc.WithNoProxy(),
110110
grpc.WithBlock(), // nolint: staticcheck
111+
grpc.WithDisableServiceConfig(),
111112
}
112113
conn, err := grpc.DialContext(ctx, address, grpcOpts...) // nolint: staticcheck
113114
defer cancel()

0 commit comments

Comments
 (0)