This commit wires together the graceful delete option for pods on the Kubelet. When a pod is deleted on the API server, a grace period is calculated that is based on the Pod.Spec.TerminationGracePeriodInSeconds, the user's provided grace period, or a default. The grace period can only shrink once set. The value provided by the user (or the default) is set onto metadata as DeletionGracePeriod. When the Kubelet sees a pod with DeletionTimestamp set, it uses the value of ObjectMeta.GracePeriodSeconds as the grace period sent to Docker. When updating status, if the pod has DeletionTimestamp set and all containers are terminated, the Kubelet will update the status one last time and then invoke Delete(pod, grace: 0) to clean up the pod immediately.
306 lines
7.4 KiB
Go
306 lines
7.4 KiB
Go
/*
|
|
Copyright 2015 The Kubernetes Authors All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package container
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"reflect"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/volume"
|
|
)
|
|
|
|
// FakeRuntime is a fake container runtime for testing.
|
|
type FakeRuntime struct {
|
|
sync.Mutex
|
|
CalledFunctions []string
|
|
PodList []*Pod
|
|
ContainerList []*Container
|
|
ImageList []Image
|
|
PodStatus api.PodStatus
|
|
StartedPods []string
|
|
KilledPods []string
|
|
StartedContainers []string
|
|
KilledContainers []string
|
|
VersionInfo string
|
|
Err error
|
|
}
|
|
|
|
// FakeRuntime should implement Runtime.
|
|
var _ Runtime = &FakeRuntime{}
|
|
|
|
type FakeVersion struct {
|
|
Version string
|
|
}
|
|
|
|
func (fv *FakeVersion) String() string {
|
|
return fv.Version
|
|
}
|
|
|
|
func (fv *FakeVersion) Compare(other string) (int, error) {
|
|
result := 0
|
|
if fv.Version > other {
|
|
result = 1
|
|
} else if fv.Version < other {
|
|
result = -1
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
type FakeRuntimeCache struct {
|
|
getter podsGetter
|
|
}
|
|
|
|
func NewFakeRuntimeCache(getter podsGetter) RuntimeCache {
|
|
return &FakeRuntimeCache{getter}
|
|
}
|
|
|
|
func (f *FakeRuntimeCache) GetPods() ([]*Pod, error) {
|
|
return f.getter.GetPods(false)
|
|
}
|
|
|
|
func (f *FakeRuntimeCache) ForceUpdateIfOlder(time.Time) error {
|
|
return nil
|
|
}
|
|
|
|
// ClearCalls resets the FakeRuntime to the initial state.
|
|
func (f *FakeRuntime) ClearCalls() {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = []string{}
|
|
f.PodList = []*Pod{}
|
|
f.ContainerList = []*Container{}
|
|
f.PodStatus = api.PodStatus{}
|
|
f.StartedPods = []string{}
|
|
f.KilledPods = []string{}
|
|
f.StartedContainers = []string{}
|
|
f.KilledContainers = []string{}
|
|
f.VersionInfo = ""
|
|
f.Err = nil
|
|
}
|
|
|
|
func (f *FakeRuntime) assertList(expect []string, test []string) error {
|
|
if !reflect.DeepEqual(expect, test) {
|
|
return fmt.Errorf("expected %#v, got %#v", expect, test)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// AssertCalls test if the invoked functions are as expected.
|
|
func (f *FakeRuntime) AssertCalls(calls []string) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
return f.assertList(calls, f.CalledFunctions)
|
|
}
|
|
|
|
func (f *FakeRuntime) AssertStartedPods(pods []string) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
return f.assertList(pods, f.StartedPods)
|
|
}
|
|
|
|
func (f *FakeRuntime) AssertKilledPods(pods []string) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
return f.assertList(pods, f.KilledPods)
|
|
}
|
|
|
|
func (f *FakeRuntime) AssertStartedContainers(containers []string) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
return f.assertList(containers, f.StartedContainers)
|
|
}
|
|
|
|
func (f *FakeRuntime) AssertKilledContainers(containers []string) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
return f.assertList(containers, f.KilledContainers)
|
|
}
|
|
|
|
func (f *FakeRuntime) Version() (Version, error) {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "Version")
|
|
return &FakeVersion{Version: f.VersionInfo}, f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) GetPods(all bool) ([]*Pod, error) {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "GetPods")
|
|
return f.PodList, f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) SyncPod(pod *api.Pod, _ Pod, _ api.PodStatus, _ []api.Secret) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "SyncPod")
|
|
f.StartedPods = append(f.StartedPods, string(pod.UID))
|
|
for _, c := range pod.Spec.Containers {
|
|
f.StartedContainers = append(f.StartedContainers, c.Name)
|
|
}
|
|
return f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) KillPod(pod *api.Pod, runningPod Pod) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "KillPod")
|
|
f.KilledPods = append(f.KilledPods, string(runningPod.ID))
|
|
for _, c := range runningPod.Containers {
|
|
f.KilledContainers = append(f.KilledContainers, c.Name)
|
|
}
|
|
return f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) RunContainerInPod(container api.Container, pod *api.Pod, volumeMap map[string]volume.VolumePlugin) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "RunContainerInPod")
|
|
f.StartedContainers = append(f.StartedContainers, container.Name)
|
|
|
|
pod.Spec.Containers = append(pod.Spec.Containers, container)
|
|
for _, c := range pod.Spec.Containers {
|
|
if c.Name == container.Name { // Container already in the pod.
|
|
return f.Err
|
|
}
|
|
}
|
|
pod.Spec.Containers = append(pod.Spec.Containers, container)
|
|
return f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) KillContainerInPod(container api.Container, pod *api.Pod) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "KillContainerInPod")
|
|
f.KilledContainers = append(f.KilledContainers, container.Name)
|
|
|
|
var containers []api.Container
|
|
for _, c := range pod.Spec.Containers {
|
|
if c.Name == container.Name {
|
|
continue
|
|
}
|
|
containers = append(containers, c)
|
|
}
|
|
return f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) GetPodStatus(*api.Pod) (*api.PodStatus, error) {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "GetPodStatus")
|
|
status := f.PodStatus
|
|
return &status, f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) GetContainers(all bool) ([]*Container, error) {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "GetContainers")
|
|
return f.ContainerList, f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) ExecInContainer(containerID string, cmd []string, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "ExecInContainer")
|
|
return f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) RunInContainer(containerID string, cmd []string) ([]byte, error) {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "RunInContainer")
|
|
return []byte{}, f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) GetContainerLogs(pod *api.Pod, containerID, tail string, follow bool, stdout, stderr io.Writer) (err error) {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "GetContainerLogs")
|
|
return f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) PullImage(image ImageSpec, pullSecrets []api.Secret) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "PullImage")
|
|
return f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) IsImagePresent(image ImageSpec) (bool, error) {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "IsImagePresent")
|
|
for _, i := range f.ImageList {
|
|
if i.ID == image.Image {
|
|
return true, f.Err
|
|
}
|
|
}
|
|
return false, f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) ListImages() ([]Image, error) {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "ListImages")
|
|
return f.ImageList, f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) RemoveImage(image ImageSpec) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "RemoveImage")
|
|
index := 0
|
|
for i := range f.ImageList {
|
|
if f.ImageList[i].ID == image.Image {
|
|
index = i
|
|
break
|
|
}
|
|
}
|
|
f.ImageList = append(f.ImageList[:index], f.ImageList[index+1:]...)
|
|
|
|
return f.Err
|
|
}
|
|
|
|
func (f *FakeRuntime) PortForward(pod *Pod, port uint16, stream io.ReadWriteCloser) error {
|
|
f.Lock()
|
|
defer f.Unlock()
|
|
|
|
f.CalledFunctions = append(f.CalledFunctions, "PortForward")
|
|
return f.Err
|
|
}
|