mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-01 18:58:18 +00:00
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.
164 lines
4.8 KiB
Go
164 lines
4.8 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 config
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/securitycontext"
|
|
|
|
"github.com/ghodss/yaml"
|
|
)
|
|
|
|
func noDefault(*api.Pod) error { return nil }
|
|
|
|
func TestDecodeSinglePod(t *testing.T) {
|
|
grace := int64(30)
|
|
pod := &api.Pod{
|
|
TypeMeta: api.TypeMeta{
|
|
APIVersion: "",
|
|
},
|
|
ObjectMeta: api.ObjectMeta{
|
|
Name: "test",
|
|
UID: "12345",
|
|
Namespace: "mynamespace",
|
|
},
|
|
Spec: api.PodSpec{
|
|
RestartPolicy: api.RestartPolicyAlways,
|
|
DNSPolicy: api.DNSClusterFirst,
|
|
TerminationGracePeriodSeconds: &grace,
|
|
Containers: []api.Container{{
|
|
Name: "image",
|
|
Image: "test/image",
|
|
ImagePullPolicy: "IfNotPresent",
|
|
TerminationMessagePath: "/dev/termination-log",
|
|
SecurityContext: securitycontext.ValidSecurityContextWithContainerDefaults(),
|
|
}},
|
|
},
|
|
}
|
|
json, err := testapi.Codec().Encode(pod)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
parsed, podOut, err := tryDecodeSinglePod(json, noDefault)
|
|
if testapi.Version() == "v1beta1" {
|
|
// v1beta1 conversion leaves empty lists that should be nil
|
|
podOut.Spec.Containers[0].Resources.Limits = nil
|
|
podOut.Spec.Containers[0].Resources.Requests = nil
|
|
}
|
|
if !parsed {
|
|
t.Errorf("expected to have parsed file: (%s)", string(json))
|
|
}
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v (%s)", err, string(json))
|
|
}
|
|
if !reflect.DeepEqual(pod, podOut) {
|
|
t.Errorf("expected:\n%#v\ngot:\n%#v\n%s", pod, podOut, string(json))
|
|
}
|
|
|
|
externalPod, err := testapi.Converter().ConvertToVersion(pod, "v1beta3")
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
yaml, err := yaml.Marshal(externalPod)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
parsed, podOut, err = tryDecodeSinglePod(yaml, noDefault)
|
|
if !parsed {
|
|
t.Errorf("expected to have parsed file: (%s)", string(yaml))
|
|
}
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v (%s)", err, string(yaml))
|
|
}
|
|
if !reflect.DeepEqual(pod, podOut) {
|
|
t.Errorf("expected:\n%#v\ngot:\n%#v\n%s", pod, podOut, string(yaml))
|
|
}
|
|
}
|
|
|
|
func TestDecodePodList(t *testing.T) {
|
|
grace := int64(30)
|
|
pod := &api.Pod{
|
|
TypeMeta: api.TypeMeta{
|
|
APIVersion: "",
|
|
},
|
|
ObjectMeta: api.ObjectMeta{
|
|
Name: "test",
|
|
UID: "12345",
|
|
Namespace: "mynamespace",
|
|
},
|
|
Spec: api.PodSpec{
|
|
RestartPolicy: api.RestartPolicyAlways,
|
|
DNSPolicy: api.DNSClusterFirst,
|
|
TerminationGracePeriodSeconds: &grace,
|
|
Containers: []api.Container{{
|
|
Name: "image",
|
|
Image: "test/image",
|
|
ImagePullPolicy: "IfNotPresent",
|
|
TerminationMessagePath: "/dev/termination-log",
|
|
SecurityContext: securitycontext.ValidSecurityContextWithContainerDefaults(),
|
|
}},
|
|
},
|
|
}
|
|
podList := &api.PodList{
|
|
Items: []api.Pod{*pod},
|
|
}
|
|
json, err := testapi.Codec().Encode(podList)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
parsed, podListOut, err := tryDecodePodList(json, noDefault)
|
|
if testapi.Version() == "v1beta1" {
|
|
// v1beta1 conversion leaves empty lists that should be nil
|
|
podListOut.Items[0].Spec.Containers[0].Resources.Limits = nil
|
|
podListOut.Items[0].Spec.Containers[0].Resources.Requests = nil
|
|
}
|
|
if !parsed {
|
|
t.Errorf("expected to have parsed file: (%s)", string(json))
|
|
}
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v (%s)", err, string(json))
|
|
}
|
|
if !reflect.DeepEqual(podList, &podListOut) {
|
|
t.Errorf("expected:\n%#v\ngot:\n%#v\n%s", podList, &podListOut, string(json))
|
|
}
|
|
|
|
externalPodList, err := testapi.Converter().ConvertToVersion(podList, "v1beta3")
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
yaml, err := yaml.Marshal(externalPodList)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
parsed, podListOut, err = tryDecodePodList(yaml, noDefault)
|
|
if !parsed {
|
|
t.Errorf("expected to have parsed file: (%s)", string(yaml))
|
|
}
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v (%s)", err, string(yaml))
|
|
}
|
|
if !reflect.DeepEqual(podList, &podListOut) {
|
|
t.Errorf("expected:\n%#v\ngot:\n%#v\n%s", pod, &podListOut, string(yaml))
|
|
}
|
|
}
|