github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

return errors instead of fataling

Browse Source
This commit is contained in:
deads2k 2016-11-21 15:10:59 -05:00
parent 49ebc2c2ae
commit 21c304333a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/kube-controller-manager/app/controllermanager.go
View File

@ -240,12 +240,12 @@ func getAvailableResources(clientBuilder controller.ControllerClientBuilder) (ma
return true, nil return true, nil
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to get api versions from server: %v", err) return nil, fmt.Errorf("failed to get api versions from server: %v", err)
} }
resourceMap, err := discoveryClient.ServerResources() resourceMap, err := discoveryClient.ServerResources()
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to get supported resources from server: %v", err) return nil, fmt.Errorf("failed to get supported resources from server: %v", err)
} }
allResources := map[schema.GroupVersionResource]bool{} allResources := map[schema.GroupVersionResource]bool{}
@ -272,7 +272,7 @@ func StartControllers(s *options.CMServer, rootClientBuilder, clientBuilder cont
if len(s.ServiceAccountKeyFile) > 0 { if len(s.ServiceAccountKeyFile) > 0 {
privateKey, err := serviceaccount.ReadPrivateKey(s.ServiceAccountKeyFile) privateKey, err := serviceaccount.ReadPrivateKey(s.ServiceAccountKeyFile)
if err != nil { if err != nil {
return fmt.Errorf("Error reading key for service account token controller: %v", err) return fmt.Errorf("error reading key for service account token controller: %v", err)
} else { } else {
var rootCA []byte var rootCA []byte
if s.RootCAFile != "" { if s.RootCAFile != "" {
@ -323,7 +323,7 @@ func StartControllers(s *options.CMServer, rootClientBuilder, clientBuilder cont
cloud, err := cloudprovider.InitCloudProvider(s.CloudProvider, s.CloudConfigFile) cloud, err := cloudprovider.InitCloudProvider(s.CloudProvider, s.CloudConfigFile)
if err != nil { if err != nil {
glog.Fatalf("Cloud provider could not be initialized: %v", err) return fmt.Errorf("cloud provider could not be initialized: %v", err)
} }
_, clusterCIDR, err := net.ParseCIDR(s.ClusterCIDR) _, clusterCIDR, err := net.ParseCIDR(s.ClusterCIDR)
@ -341,7 +341,7 @@ func StartControllers(s *options.CMServer, rootClientBuilder, clientBuilder cont
s.NodeStartupGracePeriod.Duration, s.NodeMonitorPeriod.Duration, clusterCIDR, serviceCIDR, s.NodeStartupGracePeriod.Duration, s.NodeMonitorPeriod.Duration, clusterCIDR, serviceCIDR,
int(s.NodeCIDRMaskSize), s.AllocateNodeCIDRs) int(s.NodeCIDRMaskSize), s.AllocateNodeCIDRs)
if err != nil { if err != nil {
glog.Fatalf("Failed to initialize nodecontroller: %v", err) return fmt.Errorf("failed to initialize nodecontroller: %v", err)
} }
nodeController.Run() nodeController.Run()
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter)) time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
@ -399,7 +399,7 @@ func StartControllers(s *options.CMServer, rootClientBuilder, clientBuilder cont
var gvrFn func() ([]schema.GroupVersionResource, error) var gvrFn func() ([]schema.GroupVersionResource, error)
rsrcs, err := namespaceKubeClient.Discovery().ServerResources() rsrcs, err := namespaceKubeClient.Discovery().ServerResources()
if err != nil { if err != nil {
glog.Fatalf("Failed to get group version resources: %v", err) return fmt.Errorf("failed to get group version resources: %v", err)
} }
for _, rsrcList := range rsrcs { for _, rsrcList := range rsrcs {
for ix := range rsrcList.APIResources { for ix := range rsrcList.APIResources {
@ -412,7 +412,7 @@ func StartControllers(s *options.CMServer, rootClientBuilder, clientBuilder cont
if gvrFn == nil { if gvrFn == nil {
gvr, err := namespaceKubeClient.Discovery().ServerPreferredNamespacedResources() gvr, err := namespaceKubeClient.Discovery().ServerPreferredNamespacedResources()
if err != nil { if err != nil {
glog.Fatalf("Failed to get resources: %v", err) return fmt.Errorf("failed to get resources: %v", err)
} }
gvrFn = func() ([]schema.GroupVersionResource, error) { gvrFn = func() ([]schema.GroupVersionResource, error) {
return gvr, nil return gvr, nil
@ -493,7 +493,7 @@ func StartControllers(s *options.CMServer, rootClientBuilder, clientBuilder cont
alphaProvisioner, err := NewAlphaVolumeProvisioner(cloud, s.VolumeConfiguration) alphaProvisioner, err := NewAlphaVolumeProvisioner(cloud, s.VolumeConfiguration)
if err != nil { if err != nil {
glog.Fatalf("An backward-compatible provisioner could not be created: %v, but one was expected. Provisioning will not work. This functionality is considered an early Alpha version.", err) return fmt.Errorf("an backward-compatible provisioner could not be created: %v, but one was expected. Provisioning will not work. This functionality is considered an early Alpha version.", err)
} }
params := persistentvolumecontroller.ControllerParameters{ params := persistentvolumecontroller.ControllerParameters{
KubeClient: client("persistent-volume-binder"), KubeClient: client("persistent-volume-binder"),
@ -518,7 +518,7 @@ func StartControllers(s *options.CMServer, rootClientBuilder, clientBuilder cont
cloud, cloud,
ProbeAttachableVolumePlugins(s.VolumeConfiguration)) ProbeAttachableVolumePlugins(s.VolumeConfiguration))
if attachDetachControllerErr != nil { if attachDetachControllerErr != nil {
glog.Fatalf("Failed to start attach/detach controller: %v", attachDetachControllerErr) return fmt.Errorf("failed to start attach/detach controller: %v", attachDetachControllerErr)
} }
go attachDetachController.Run(stop) go attachDetachController.Run(stop)
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter)) time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
@ -552,7 +552,7 @@ func StartControllers(s *options.CMServer, rootClientBuilder, clientBuilder cont
gcClientset := client("generic-garbage-collector") gcClientset := client("generic-garbage-collector")
groupVersionResources, err := gcClientset.Discovery().ServerPreferredResources() groupVersionResources, err := gcClientset.Discovery().ServerPreferredResources()
if err != nil { if err != nil {
glog.Fatalf("Failed to get supported resources from server: %v", err) return fmt.Errorf("failed to get supported resources from server: %v", err)
} }
config := rootClientBuilder.ConfigOrDie("generic-garbage-collector") config := rootClientBuilder.ConfigOrDie("generic-garbage-collector")