github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Updating methods to return error rather than using glog.Fatalf

Browse Source
This commit is contained in:
nikhiljindal
2016-02-03 14:26:11 -08:00
parent 2aa28c6553
commit c7beb9078c
16 changed files with 128 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/master/master.go
View File

@@ -131,12 +131,15 @@ type thirdPartyEntry struct {
// Certain config fields will be set to a default value if unset.
// Certain config fields must be specified, including:
// KubeletClient
func New(c *Config) *Master {
func New(c *Config) (*Master, error) {
if c.KubeletClient == nil {
glog.Fatalf("Master.New() called with config.KubeletClient == nil")
return nil, fmt.Errorf("Master.New() called with config.KubeletClient == nil")
}
s := genericapiserver.New(c.Config)
s, err := genericapiserver.New(c.Config)
if err != nil {
return nil, err
}
m := &Master{
GenericAPIServer: s,
@@ -155,7 +158,7 @@ func New(c *Config) *Master {
m.NewBootstrapController().Start()
}
return m
return m, nil
}
func (m *Master) InstallAPIs(c *Config) {