github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #43302 from harryge00/fix-typo

Browse Source 
Automatic merge from submit-queue

fix typos

**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue 2017-03-24 10:27:18 -07:00 committed by GitHub
commit 7e6b8c19b9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/client_builder.go
View File

@ -40,7 +40,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
) )
// ControllerClientBuilder allow syou to get clients and configs for controllers // ControllerClientBuilder allows you to get clients and configs for controllers
type ControllerClientBuilder interface { type ControllerClientBuilder interface {
Config(name string) (*restclient.Config, error) Config(name string) (*restclient.Config, error)
ConfigOrDie(name string) *restclient.Config ConfigOrDie(name string) *restclient.Config

2
pkg/controller/daemon/daemoncontroller.go
View File

@ -265,7 +265,7 @@ func (dsc *DaemonSetsController) getPodDaemonSets(pod *v1.Pod) []*extensions.Dae
return nil return nil
} }
if len(sets) > 1 { if len(sets) > 1 {
// ControllerRef will ensure we don't do anythign crazy, but more than one // ControllerRef will ensure we don't do anything crazy, but more than one
// item in this list nevertheless constitutes user error. // item in this list nevertheless constitutes user error.
utilruntime.HandleError(fmt.Errorf("user error! more than one daemon is selecting pods with labels: %+v", pod.Labels)) utilruntime.HandleError(fmt.Errorf("user error! more than one daemon is selecting pods with labels: %+v", pod.Labels))
} }