github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3455 from saad-ali/followup3423

Browse Source 
Address nits from PR #3423
This commit is contained in:
Eric Tune 2015-01-14 07:33:10 -08:00
commit 28555bb653
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/config/config.go
View File

@ -76,7 +76,9 @@ func (c *PodConfig) Channel(source string) chan<- interface{} {
return c.mux.Channel(source) return c.mux.Channel(source)
} }
func (c *PodConfig) SourceSeen(source string) bool { // IsSourceSeen returns true if the specified source string has previously
// been marked as seen.
func (c *PodConfig) IsSourceSeen(source string) bool {
if c.pods == nil { if c.pods == nil {
return false return false
} }

2
pkg/kubelet/types.go
View File

@ -81,7 +81,7 @@ func ParsePodFullName(podFullName string) (podName, podNamespace string, podAnno
expectedNumFields := 3 expectedNumFields := 3
actualNumFields := len(parts) actualNumFields := len(parts)
if actualNumFields != expectedNumFields { if actualNumFields != expectedNumFields {
glog.Warningf("found a podFullName (%q) with too few fields: expected %d, actual %d.", podFullName, expectedNumFields, actualNumFields) glog.Errorf("found a podFullName (%q) with too few fields: expected %d, actual %d.", podFullName, expectedNumFields, actualNumFields)
return return
} }
podName = parts[0] podName = parts[0]

2
pkg/standalone/standalone.go
View File

@ -274,7 +274,7 @@ func createAndInitKubelet(kc *KubeletConfig, pc *config.PodConfig) (*kubelet.Kub
kc.RegistryBurst, kc.RegistryBurst,
kc.MinimumGCAge, kc.MinimumGCAge,
kc.MaxContainerCount, kc.MaxContainerCount,
pc.SourceSeen, pc.IsSourceSeen,
kc.ClusterDomain, kc.ClusterDomain,
net.IP(kc.ClusterDNS)) net.IP(kc.ClusterDNS))