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

add new event when infra-container change

Browse Source
This commit is contained in:
jiangyaoguo 2015-10-29 19:41:22 +08:00
parent 3ce5a51007
commit 39858db29e
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1672,6 +1672,7 @@ func (dm *DockerManager) createPodInfraContainer(pod *api.Pod) (kubetypes.Docker
type empty struct{} type empty struct{}
type PodContainerChangesSpec struct { type PodContainerChangesSpec struct {
StartInfraContainer bool StartInfraContainer bool
InfraChanged bool
InfraContainerId kubetypes.DockerID InfraContainerId kubetypes.DockerID
ContainersToStart map[int]empty ContainersToStart map[int]empty
ContainersToKeep map[kubetypes.DockerID]int ContainersToKeep map[kubetypes.DockerID]int
@ -1777,6 +1778,7 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, runningPod kub
return PodContainerChangesSpec{ return PodContainerChangesSpec{
StartInfraContainer: createPodInfraContainer, StartInfraContainer: createPodInfraContainer,
InfraChanged: changed,
InfraContainerId: podInfraContainerID, InfraContainerId: podInfraContainerID,
ContainersToStart: containersToStart, ContainersToStart: containersToStart,
ContainersToKeep: containersToKeep, ContainersToKeep: containersToKeep,
@ -1811,10 +1813,18 @@ func (dm *DockerManager) SyncPod(pod *api.Pod, runningPod kubecontainer.Pod, pod
} }
glog.V(3).Infof("Got container changes for pod %q: %+v", podFullName, containerChanges) glog.V(3).Infof("Got container changes for pod %q: %+v", podFullName, containerChanges)
if containerChanges.InfraChanged {
ref, err := api.GetReference(pod)
if err != nil {
glog.Errorf("Couldn't make a ref to pod %q: '%v'", podFullName, err)
}
dm.recorder.Eventf(ref, "InfraChanged", "Pod infrastructure changed, it will be killed and re-created.")
}
if containerChanges.StartInfraContainer || (len(containerChanges.ContainersToKeep) == 0 && len(containerChanges.ContainersToStart) == 0) { if containerChanges.StartInfraContainer || (len(containerChanges.ContainersToKeep) == 0 && len(containerChanges.ContainersToStart) == 0) {
if len(containerChanges.ContainersToKeep) == 0 && len(containerChanges.ContainersToStart) == 0 { if len(containerChanges.ContainersToKeep) == 0 && len(containerChanges.ContainersToStart) == 0 {
glog.V(4).Infof("Killing Infra Container for %q because all other containers are dead.", podFullName) glog.V(4).Infof("Killing Infra Container for %q because all other containers are dead.", podFullName)
} else { } else {
glog.V(4).Infof("Killing Infra Container for %q, will start new one", podFullName) glog.V(4).Infof("Killing Infra Container for %q, will start new one", podFullName)
} }