Skip to content

Use SupportsDataplaneFeatures helper #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2022
Merged

Use SupportsDataplaneFeatures helper #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 3 additions & 8 deletions pkg/consuldp/consul_dataplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,9 @@ func (cdp *ConsulDataplane) Run(ctx context.Context) error {
ServerWatchDisabled: cdp.cfg.Consul.ServerWatchDisabled,
Credentials: creds,
TLS: tls,
ServerEvalFn: func(state discovery.State) bool {
// We require support for generating Envoy bootstrap configuration at least.
//
// TODO: now that we consume Consul's protobufs as a Go module, should we
// have the discovery package expose the protobuf enum type rather than the
// string representation?
return state.DataplaneFeatures[pbdataplane.DataplaneFeatures_DATAPLANE_FEATURES_ENVOY_BOOTSTRAP_CONFIGURATION.String()]
},
ServerEvalFn: discovery.SupportsDataplaneFeatures(
pbdataplane.DataplaneFeatures_DATAPLANE_FEATURES_ENVOY_BOOTSTRAP_CONFIGURATION.String(),
),
}, cdp.logger.Named("server-connection-manager"))
if err != nil {
return err
Expand Down