github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

optimise the style for parseReservation function 

Signed-off-by: PingWang <wang.ping5@zte.com.cn>

optimise some code style in server.go

Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
pull/6/head
PingWang 2016-07-27 11:48:13 +08:00
parent b7e8791746
commit bb191a07ea
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/kubelet/app/server.go
View File

@ -438,12 +438,12 @@ func InitializeTLS(s *options.KubeletServer) (*server.TLSOptions, error) {
func authPathClientConfig(s *options.KubeletServer, useDefaults bool) (*restclient.Config, error) { func authPathClientConfig(s *options.KubeletServer, useDefaults bool) (*restclient.Config, error) {
authInfo, err := clientauth.LoadFromFile(s.AuthPath.Value()) 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 // If loading the default auth path, for backwards compatibility keep going
// with the default auth. // with the default auth.
if err != nil { if err != nil {
if !useDefaults {
return nil, err
}
glog.Warningf("Could not load kubernetes auth path %s: %v. Continuing with defaults.", s.AuthPath, err) glog.Warningf("Could not load kubernetes auth path %s: %v. Continuing with defaults.", s.AuthPath, err)
} }
if authInfo == nil { 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) { func parseReservation(kubeReserved, systemReserved utilconfig.ConfigurationMap) (*kubetypes.Reservation, error) {
reservation := new(kubetypes.Reservation) reservation := new(kubetypes.Reservation)
if rl, err := parseResourceList(kubeReserved); err != nil { rl, err := parseResourceList(kubeReserved)
if err != nil {
return nil, err return nil, err
} else { }
reservation.Kubernetes = rl reservation.Kubernetes = rl
}
if rl, err := parseResourceList(systemReserved); err != nil { rl, err = parseResourceList(systemReserved)
if err != nil {
return nil, err return nil, err
} else {
reservation.System = rl
} }
reservation.System = rl
return reservation, nil return reservation, nil
} }