github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 05:21:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42474 from k82cn/rm_empty_line_kl

Browse Source 
Automatic merge from submit-queue

Removed un-necessary empty line.
This commit is contained in:
Kubernetes Submit Queue 2017-04-14 07:23:11 -07:00 committed by GitHub
commit b0a05b4597
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,6 @@ HTTP server: The kubelet can also listen for HTTP and respond to a simple API
// UnsecuredKubeletDeps returns a KubeletDeps suitable for being run, or an error if the server setup // UnsecuredKubeletDeps returns a KubeletDeps suitable for being run, or an error if the server setup
// is not valid. It will not start any background processes, and does not include authentication/authorization // is not valid. It will not start any background processes, and does not include authentication/authorization
func UnsecuredKubeletDeps(s *options.KubeletServer) (*kubelet.KubeletDeps, error) { func UnsecuredKubeletDeps(s *options.KubeletServer) (*kubelet.KubeletDeps, error) {
// Initialize the TLS Options // Initialize the TLS Options
tlsOptions, err := InitializeTLS(&s.KubeletFlags, &s.KubeletConfiguration) tlsOptions, err := InitializeTLS(&s.KubeletFlags, &s.KubeletConfiguration)
if err != nil { if err != nil {
@ -353,7 +352,6 @@ func makeEventRecorder(s *componentconfig.KubeletConfiguration, kubeDeps *kubele
} else { } else {
glog.Warning("No api server defined - no events will be sent to API server.") glog.Warning("No api server defined - no events will be sent to API server.")
} }
} }
func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) { func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) {

1
pkg/kubelet/kubelet_node_status.go
View File

@ -209,7 +209,6 @@ func (kl *Kubelet) initialNode() (*v1.Node, error) {
} }
} }
node.Spec.Taints = taints node.Spec.Taints = taints
} }
// Initially, set NodeNetworkUnavailable to true. // Initially, set NodeNetworkUnavailable to true.
if kl.providerRequiresNetworkingConfiguration() { if kl.providerRequiresNetworkingConfiguration() {