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

Merge pull request #29658 from ping035627/ping035627-patch-0727-2

Browse Source 
Automatic merge from submit-queue

optimise some code style in server.go

The PR modified some code style for authPathClientConfig and parseReservation function in server.go.
This commit is contained in:
k8s-merge-robot 2016-08-01 23:36:14 -07:00 committed by GitHub
commit 88172c4815
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

@ -442,12 +442,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 {
@ -987,16 +987,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
} }