IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

K8s: fix nil deref from dummy factory for API Server options (#83132)

Browse Source
This commit is contained in:
Charandas 2024-02-20 13:00:02 -08:00 committed by GitHub
parent 16dee3cf1c
commit 0bd009fb53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cmd/grafana/apiserver/cmd.go
View File

@ -62,7 +62,10 @@ func newCommandStartExampleAPIServer(o *APIServerOptions, stopCh <-chan struct{}
} }
cmd.Flags().StringVar(&runtimeConfig, "runtime-config", "", "A set of key=value pairs that enable or disable built-in APIs.") cmd.Flags().StringVar(&runtimeConfig, "runtime-config", "", "A set of key=value pairs that enable or disable built-in APIs.")
o.factory.GetOptions().AddFlags(cmd.Flags())
if factoryOptions := o.factory.GetOptions(); factoryOptions != nil {
factoryOptions.AddFlags(cmd.Flags())
}
// Register standard k8s flags with the command line // Register standard k8s flags with the command line
o.RecommendedOptions = options.NewRecommendedOptions( o.RecommendedOptions = options.NewRecommendedOptions(