Merge pull request #70171 from mysunshine92/remove-kubeClient

remove kubeClient != nil  when using glog.Fatalf
This commit is contained in:
k8s-ci-robot 2018-10-24 06:00:09 -07:00 committed by GitHub
commit 3ed36eac28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -96,13 +96,13 @@ func NewNodeIpamController(
eventBroadcaster := record.NewBroadcaster() eventBroadcaster := record.NewBroadcaster()
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
glog.V(0).Infof("Sending events to api server.") glog.Infof("Sending events to api server.")
eventBroadcaster.StartRecordingToSink( eventBroadcaster.StartRecordingToSink(
&v1core.EventSinkImpl{ &v1core.EventSinkImpl{
Interface: kubeClient.CoreV1().Events(""), Interface: kubeClient.CoreV1().Events(""),
}) })
if kubeClient != nil && kubeClient.CoreV1().RESTClient().GetRateLimiter() != nil { if kubeClient.CoreV1().RESTClient().GetRateLimiter() != nil {
metrics.RegisterMetricAndTrackRateLimiterUsage("node_ipam_controller", kubeClient.CoreV1().RESTClient().GetRateLimiter()) metrics.RegisterMetricAndTrackRateLimiterUsage("node_ipam_controller", kubeClient.CoreV1().RESTClient().GetRateLimiter())
} }

View File

@ -275,7 +275,7 @@ func NewNodeLifecycleController(
Interface: v1core.New(kubeClient.CoreV1().RESTClient()).Events(""), Interface: v1core.New(kubeClient.CoreV1().RESTClient()).Events(""),
}) })
if kubeClient != nil && kubeClient.CoreV1().RESTClient().GetRateLimiter() != nil { if kubeClient.CoreV1().RESTClient().GetRateLimiter() != nil {
metrics.RegisterMetricAndTrackRateLimiterUsage("node_lifecycle_controller", kubeClient.CoreV1().RESTClient().GetRateLimiter()) metrics.RegisterMetricAndTrackRateLimiterUsage("node_lifecycle_controller", kubeClient.CoreV1().RESTClient().GetRateLimiter())
} }