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

Merge pull request #17764 from jiangyaoguo/make-containerspecchange-private

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-11 17:40:34 -08:00
commit 3d24d25fd8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubelet/dockertools/manager.go
View File

@ -1608,7 +1608,6 @@ func (dm *DockerManager) createPodInfraContainer(pod *api.Pod) (kubetypes.Docker
return kubetypes.DockerID(id.ID), nil return kubetypes.DockerID(id.ID), nil
} }
// TODO(vmarmol): This will soon be made non-public when its only use is internal.
// Structure keeping information on changes that need to happen for a pod. The semantics is as follows: // Structure keeping information on changes that need to happen for a pod. The semantics is as follows:
// - startInfraContainer is true if new Infra Containers have to be started and old one (if running) killed. // - startInfraContainer is true if new Infra Containers have to be started and old one (if running) killed.
// Additionally if it is true then containersToKeep have to be empty // Additionally if it is true then containersToKeep have to be empty
@ -1619,7 +1618,7 @@ func (dm *DockerManager) createPodInfraContainer(pod *api.Pod) (kubetypes.Docker
// It shouldn't be the case where containersToStart is empty and containersToKeep contains only infraContainerId. In such case // It shouldn't be the case where containersToStart is empty and containersToKeep contains only infraContainerId. In such case
// Infra Container should be killed, hence it's removed from this map. // Infra Container should be killed, hence it's removed from this map.
// - all running containers which are NOT contained in containersToKeep should be killed. // - all running containers which are NOT contained in containersToKeep should be killed.
type PodContainerChangesSpec struct { type podContainerChangesSpec struct {
StartInfraContainer bool StartInfraContainer bool
InfraChanged bool InfraChanged bool
InfraContainerId kubetypes.DockerID InfraContainerId kubetypes.DockerID
@ -1627,7 +1626,7 @@ type PodContainerChangesSpec struct {
ContainersToKeep map[kubetypes.DockerID]int ContainersToKeep map[kubetypes.DockerID]int
} }
func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, podStatus *kubecontainer.PodStatus) (PodContainerChangesSpec, error) { func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, podStatus *kubecontainer.PodStatus) (podContainerChangesSpec, error) {
start := time.Now() start := time.Now()
defer func() { defer func() {
metrics.ContainerManagerLatency.WithLabelValues("computePodContainerChanges").Observe(metrics.SinceInMicroseconds(start)) metrics.ContainerManagerLatency.WithLabelValues("computePodContainerChanges").Observe(metrics.SinceInMicroseconds(start))
@ -1645,7 +1644,7 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, podStatus *kub
glog.V(4).Infof("Found pod infra container for %q", format.Pod(pod)) glog.V(4).Infof("Found pod infra container for %q", format.Pod(pod))
changed, err = dm.podInfraContainerChanged(pod, podInfraContainerStatus) changed, err = dm.podInfraContainerChanged(pod, podInfraContainerStatus)
if err != nil { if err != nil {
return PodContainerChangesSpec{}, err return podContainerChangesSpec{}, err
} }
} }
@ -1726,7 +1725,7 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, podStatus *kub
containersToKeep = make(map[kubetypes.DockerID]int) containersToKeep = make(map[kubetypes.DockerID]int)
} }
return PodContainerChangesSpec{ return podContainerChangesSpec{
StartInfraContainer: createPodInfraContainer, StartInfraContainer: createPodInfraContainer,
InfraChanged: changed, InfraChanged: changed,
InfraContainerId: podInfraContainerID, InfraContainerId: podInfraContainerID,