From bb191a07eaa28d10e82c5337d21991465293a787 Mon Sep 17 00:00:00 2001 From: PingWang Date: Wed, 27 Jul 2016 11:48:13 +0800 Subject: [PATCH] optimise the style for parseReservation function Signed-off-by: PingWang optimise some code style in server.go Signed-off-by: PingWang update Signed-off-by: PingWang update Signed-off-by: PingWang --- cmd/kubelet/app/server.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index db938ffd6a3..40b8b33e659 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -438,12 +438,12 @@ func InitializeTLS(s *options.KubeletServer) (*server.TLSOptions, error) { func authPathClientConfig(s *options.KubeletServer, useDefaults bool) (*restclient.Config, error) { authInfo, err := clientauth.LoadFromFile(s.AuthPath.Value()) - if err != nil && !useDefaults { - return nil, err - } // If loading the default auth path, for backwards compatibility keep going // with the default auth. if err != nil { + if !useDefaults { + return nil, err + } glog.Warningf("Could not load kubernetes auth path %s: %v. Continuing with defaults.", s.AuthPath, err) } if authInfo == nil { @@ -983,16 +983,18 @@ func CreateAndInitKubelet(kc *KubeletConfig) (k KubeletBootstrap, pc *config.Pod func parseReservation(kubeReserved, systemReserved utilconfig.ConfigurationMap) (*kubetypes.Reservation, error) { reservation := new(kubetypes.Reservation) - if rl, err := parseResourceList(kubeReserved); err != nil { + rl, err := parseResourceList(kubeReserved) + if err != nil { return nil, err - } else { - reservation.Kubernetes = rl } - if rl, err := parseResourceList(systemReserved); err != nil { + reservation.Kubernetes = rl + + rl, err = parseResourceList(systemReserved) + if err != nil { return nil, err - } else { - reservation.System = rl } + reservation.System = rl + return reservation, nil }