github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

skip GetHostIP call on standalone mode kubelet to fix spammy log statement

Browse Source
This commit is contained in:
Mike Danese 2015-06-12 10:20:26 -07:00
parent 52db576617
commit 5896ac9e07
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,7 @@ type KubeletServer struct {
OOMScoreAdj int OOMScoreAdj int
APIServerList util.StringList APIServerList util.StringList
RegisterNode bool RegisterNode bool
StandaloneMode bool
ClusterDomain string ClusterDomain string
MasterServiceNamespace string MasterServiceNamespace string
ClusterDNS util.IP ClusterDNS util.IP
@ -332,6 +333,7 @@ func (s *KubeletServer) Run(_ []string) error {
MaxPerPodContainerCount: s.MaxPerPodContainerCount, MaxPerPodContainerCount: s.MaxPerPodContainerCount,
MaxContainerCount: s.MaxContainerCount, MaxContainerCount: s.MaxContainerCount,
RegisterNode: s.RegisterNode, RegisterNode: s.RegisterNode,
StandaloneMode: (len(s.APIServerList) == 0),
ClusterDomain: s.ClusterDomain, ClusterDomain: s.ClusterDomain,
ClusterDNS: s.ClusterDNS, ClusterDNS: s.ClusterDNS,
Runonce: s.RunOnce, Runonce: s.RunOnce,
@ -662,6 +664,7 @@ type KubeletConfig struct {
MaxPerPodContainerCount int MaxPerPodContainerCount int
MaxContainerCount int MaxContainerCount int
RegisterNode bool RegisterNode bool
StandaloneMode bool
ClusterDomain string ClusterDomain string
ClusterDNS util.IP ClusterDNS util.IP
EnableServer bool EnableServer bool
@ -722,6 +725,7 @@ func createAndInitKubelet(kc *KubeletConfig) (k KubeletBootstrap, pc *config.Pod
gcPolicy, gcPolicy,
pc.SeenAllSources, pc.SeenAllSources,
kc.RegisterNode, kc.RegisterNode,
kc.StandaloneMode,
kc.ClusterDomain, kc.ClusterDomain,
net.IP(kc.ClusterDNS), net.IP(kc.ClusterDNS),
kc.MasterServiceNamespace, kc.MasterServiceNamespace,

18
contrib/mesos/pkg/executor/service/service.go
View File

@ -218,14 +218,15 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error {
// ManifestURL: "" // ManifestURL: ""
// FileCheckFrequency // FileCheckFrequency
// HTTPCheckFrequency // HTTPCheckFrequency
PodInfraContainerImage: s.PodInfraContainerImage, PodInfraContainerImage: s.PodInfraContainerImage,
SyncFrequency: s.SyncFrequency, SyncFrequency: s.SyncFrequency,
RegistryPullQPS: s.RegistryPullQPS, RegistryPullQPS: s.RegistryPullQPS,
RegistryBurst: s.RegistryBurst, RegistryBurst: s.RegistryBurst,
MinimumGCAge: s.MinimumGCAge, MinimumGCAge: s.MinimumGCAge,
MaxPerPodContainerCount: s.MaxPerPodContainerCount, MaxPerPodContainerCount: s.MaxPerPodContainerCount,
MaxContainerCount: s.MaxContainerCount, MaxContainerCount: s.MaxContainerCount,
RegisterNode: s.RegisterNode, RegisterNode: s.RegisterNode,
// StandaloneMode: false
ClusterDomain: s.ClusterDomain, ClusterDomain: s.ClusterDomain,
ClusterDNS: s.ClusterDNS, ClusterDNS: s.ClusterDNS,
Runonce: s.RunOnce, Runonce: s.RunOnce,
@ -327,6 +328,7 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
gcPolicy, gcPolicy,
pc.SeenAllSources, pc.SeenAllSources,
kc.RegisterNode, kc.RegisterNode,
kc.StandaloneMode,
kc.ClusterDomain, kc.ClusterDomain,
net.IP(kc.ClusterDNS), net.IP(kc.ClusterDNS),
kc.MasterServiceNamespace, kc.MasterServiceNamespace,

17
pkg/kubelet/kubelet.go
View File

@ -124,6 +124,7 @@ func NewMainKubelet(
containerGCPolicy ContainerGCPolicy, containerGCPolicy ContainerGCPolicy,
sourcesReady SourcesReadyFn, sourcesReady SourcesReadyFn,
registerNode bool, registerNode bool,
standaloneMode bool,
clusterDomain string, clusterDomain string,
clusterDNS net.IP, clusterDNS net.IP,
masterServiceNamespace string, masterServiceNamespace string,
@ -232,6 +233,7 @@ func NewMainKubelet(
httpClient: &http.Client{}, httpClient: &http.Client{},
sourcesReady: sourcesReady, sourcesReady: sourcesReady,
registerNode: registerNode, registerNode: registerNode,
standaloneMode: standaloneMode,
clusterDomain: clusterDomain, clusterDomain: clusterDomain,
clusterDNS: clusterDNS, clusterDNS: clusterDNS,
serviceLister: serviceLister, serviceLister: serviceLister,
@ -387,6 +389,9 @@ type Kubelet struct {
// Set to true to have the node register itself with the apiserver. // Set to true to have the node register itself with the apiserver.
registerNode bool registerNode bool
// Set to true if the kubelet is in standalone mode (i.e. setup without an apiserver)
standaloneMode bool
// If non-empty, use this for container DNS search. // If non-empty, use this for container DNS search.
clusterDomain string clusterDomain string
@ -2124,11 +2129,13 @@ func (kl *Kubelet) generatePodStatus(pod *api.Pod) (api.PodStatus, error) {
podStatus.Conditions = append(podStatus.Conditions, getPodReadyCondition(spec, podStatus.ContainerStatuses)...) podStatus.Conditions = append(podStatus.Conditions, getPodReadyCondition(spec, podStatus.ContainerStatuses)...)
hostIP, err := kl.GetHostIP() if !kl.standaloneMode {
if err != nil { hostIP, err := kl.GetHostIP()
glog.Errorf("Cannot get host IP: %v", err) if err != nil {
} else { glog.V(4).Infof("Cannot get host IP: %v", err)
podStatus.HostIP = hostIP.String() } else {
podStatus.HostIP = hostIP.String()
}
} }
return *podStatus, nil return *podStatus, nil