Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions internal/cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,8 @@

// Setup the Extension Manager
var extMgr types.Manager
if cfg.EnvoyGateway.Provider.Type == egv1a1.ProviderTypeKubernetes {
if extMgr, err = extensionregistry.NewManager(cfg); err != nil {
return err
}
if extMgr, err = extensionregistry.NewManager(cfg, cfg.EnvoyGateway.Provider.Type == egv1a1.ProviderTypeKubernetes); err != nil {
return err

Check warning on line 165 in internal/cmd/server.go

View check run for this annotation

Codecov / codecov/patch

internal/cmd/server.go#L164-L165

Added lines #L164 - L165 were not covered by tests
}

runners := []struct {
Expand Down
15 changes: 11 additions & 4 deletions internal/extension/registry/extension_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,14 @@
}

// NewManager returns a new Manager
func NewManager(cfg *config.Server) (extTypes.Manager, error) {
cli, err := k8scli.New(k8sclicfg.GetConfigOrDie(), k8scli.Options{Scheme: envoygateway.GetScheme()})
if err != nil {
return nil, err
func NewManager(cfg *config.Server, inK8s bool) (extTypes.Manager, error) {
var cli k8scli.Client
var err error
if inK8s {
cli, err = k8scli.New(k8sclicfg.GetConfigOrDie(), k8scli.Options{Scheme: envoygateway.GetScheme()})
if err != nil {
return nil, err
}

Check warning on line 69 in internal/extension/registry/extension_manager.go

View check run for this annotation

Codecov / codecov/patch

internal/extension/registry/extension_manager.go#L62-L69

Added lines #L62 - L69 were not covered by tests
}

var extension *egv1a1.ExtensionManager
Expand Down Expand Up @@ -271,6 +275,9 @@
if ext.Service == nil {
return nil, errors.New("the registered extension doesn't have a service config")
}
if ext.Service.TLS != nil && client == nil {
return nil, errors.New("the registered extension's service config has TLS enabled but no k8s client was provided")
}

Check warning on line 280 in internal/extension/registry/extension_manager.go

View check run for this annotation

Codecov / codecov/patch

internal/extension/registry/extension_manager.go#L279-L280

Added lines #L279 - L280 were not covered by tests

var opts []grpc.DialOption
if ext.Service.TLS != nil {
Expand Down