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

Rename kubelet variable pods to maxPods in kubelet pkg to match pods variable in kubelet cmd.

Browse Source 
Remove comment requesting modification of mesos contrib file, dependencies should be maintained in unit tests
This commit is contained in:
cephaslr 2015-11-16 20:15:40 -05:00
parent 70d89a3541
commit aef7af1ba4
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,9 +17,6 @@ limitations under the License.
// Package app makes it easy to create a kubelet server for various contexts. // Package app makes it easy to create a kubelet server for various contexts.
package app package app
// Note: if you change code in this file, you might need to change code in
// contrib/mesos/pkg/executor/service/.
import ( import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"

15
pkg/kubelet/kubelet.go
View File

@ -16,9 +16,6 @@ limitations under the License.
package kubelet package kubelet
// Note: if you change code in this file, you might need to change code in
// contrib/mesos/pkg/executor/.
import ( import (
"bytes" "bytes"
"errors" "errors"
@ -205,7 +202,7 @@ func NewMainKubelet(
configureCBR0 bool, configureCBR0 bool,
podCIDR string, podCIDR string,
reconcileCIDR bool, reconcileCIDR bool,
pods int, maxPods int,
dockerExecHandler dockertools.ExecHandler, dockerExecHandler dockertools.ExecHandler,
resolverConfig string, resolverConfig string,
cpuCFSQuota bool, cpuCFSQuota bool,
@ -315,7 +312,7 @@ func NewMainKubelet(
writer: writer, writer: writer,
configureCBR0: configureCBR0, configureCBR0: configureCBR0,
reconcileCIDR: reconcileCIDR, reconcileCIDR: reconcileCIDR,
pods: pods, maxPods: maxPods,
syncLoopMonitor: util.AtomicValue{}, syncLoopMonitor: util.AtomicValue{},
resolverConfig: resolverConfig, resolverConfig: resolverConfig,
cpuCFSQuota: cpuCFSQuota, cpuCFSQuota: cpuCFSQuota,
@ -606,8 +603,8 @@ type Kubelet struct {
configureCBR0 bool configureCBR0 bool
reconcileCIDR bool reconcileCIDR bool
// Number of Pods which can be run by this Kubelet // Maximum Number of Pods which can be run by this Kubelet
pods int maxPods int
// Monitor Kubelet's sync loop // Monitor Kubelet's sync loop
syncLoopMonitor util.AtomicValue syncLoopMonitor util.AtomicValue
@ -2602,7 +2599,7 @@ func (kl *Kubelet) setNodeStatus(node *api.Node) error {
node.Status.Capacity = api.ResourceList{ node.Status.Capacity = api.ResourceList{
api.ResourceCPU: *resource.NewMilliQuantity(0, resource.DecimalSI), api.ResourceCPU: *resource.NewMilliQuantity(0, resource.DecimalSI),
api.ResourceMemory: resource.MustParse("0Gi"), api.ResourceMemory: resource.MustParse("0Gi"),
api.ResourcePods: *resource.NewQuantity(int64(kl.pods), resource.DecimalSI), api.ResourcePods: *resource.NewQuantity(int64(kl.maxPods), resource.DecimalSI),
} }
glog.Errorf("Error getting machine info: %v", err) glog.Errorf("Error getting machine info: %v", err)
} else { } else {
@ -2610,7 +2607,7 @@ func (kl *Kubelet) setNodeStatus(node *api.Node) error {
node.Status.NodeInfo.SystemUUID = info.SystemUUID node.Status.NodeInfo.SystemUUID = info.SystemUUID
node.Status.Capacity = cadvisor.CapacityFromMachineInfo(info) node.Status.Capacity = cadvisor.CapacityFromMachineInfo(info)
node.Status.Capacity[api.ResourcePods] = *resource.NewQuantity( node.Status.Capacity[api.ResourcePods] = *resource.NewQuantity(
int64(kl.pods), resource.DecimalSI) int64(kl.maxPods), resource.DecimalSI)
if node.Status.NodeInfo.BootID != "" && if node.Status.NodeInfo.BootID != "" &&
node.Status.NodeInfo.BootID != info.BootID { node.Status.NodeInfo.BootID != info.BootID {
// TODO: This requires a transaction, either both node status is updated // TODO: This requires a transaction, either both node status is updated