Skip to content
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

Jump to bottom

[v14] Prevent possible panic caused missing cluster features when TAG is enabled #39456

Closed
wants to merge 1 commit into from
Closed

[v14] Prevent possible panic caused missing cluster features when TAG is enabled #39456

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions lib/service/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ func (process *TeleportProcess) initDiscoveryService() error {
PollInterval: process.Config.Discovery.PollInterval,
ServerCredentials: tlsConfig,
AccessGraphConfig: process.Config.AccessGraph,
ClusterFeatures: process.getClusterFeatures,
})
if err != nil {
return trace.Wrap(err)
Expand Down
4 changes: 4 additions & 0 deletions lib/srv/discovery/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ func (c *Config) CheckAndSetDefaults() error {
return trace.BadParameter("no AccessPoint configured for discovery")
}

if c.ClusterFeatures == nil {
return trace.BadParameter("no ClusterFeatures configured for discovery")
}

if len(c.Matchers.Kubernetes) > 0 && c.DiscoveryGroup == "" {
return trace.BadParameter(`the DiscoveryGroup name should be set for discovery server if
kubernetes matchers are present.`)
Expand Down
Loading