72ee028cab
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.
488 lines
12 KiB
Go
488 lines
12 KiB
Go
/*
|
|
Copyright 2014 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 resource
|
|
|
|
import (
|
|
"bytes"
|
|
"errors"
|
|
"io"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"reflect"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
|
|
)
|
|
|
|
func objBody(obj runtime.Object) io.ReadCloser {
|
|
return ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Codec(), obj))))
|
|
}
|
|
|
|
// splitPath returns the segments for a URL path.
|
|
func splitPath(path string) []string {
|
|
path = strings.Trim(path, "/")
|
|
if path == "" {
|
|
return []string{}
|
|
}
|
|
return strings.Split(path, "/")
|
|
}
|
|
|
|
func TestHelperDelete(t *testing.T) {
|
|
tests := []struct {
|
|
Err bool
|
|
Req func(*http.Request) bool
|
|
Resp *http.Response
|
|
HttpErr error
|
|
}{
|
|
{
|
|
HttpErr: errors.New("failure"),
|
|
Err: true,
|
|
},
|
|
{
|
|
Resp: &http.Response{
|
|
StatusCode: http.StatusNotFound,
|
|
Body: objBody(&api.Status{Status: api.StatusFailure}),
|
|
},
|
|
Err: true,
|
|
},
|
|
{
|
|
Resp: &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: objBody(&api.Status{Status: api.StatusSuccess}),
|
|
},
|
|
Req: func(req *http.Request) bool {
|
|
if req.Method != "DELETE" {
|
|
t.Errorf("unexpected method: %#v", req)
|
|
return false
|
|
}
|
|
parts := splitPath(req.URL.Path)
|
|
if len(parts) < 3 {
|
|
t.Errorf("expected URL path to have 3 parts: %s", req.URL.Path)
|
|
return false
|
|
}
|
|
if parts[1] != "bar" {
|
|
t.Errorf("url doesn't contain namespace: %#v", req)
|
|
return false
|
|
}
|
|
if parts[2] != "foo" {
|
|
t.Errorf("url doesn't contain name: %#v", req)
|
|
return false
|
|
}
|
|
return true
|
|
},
|
|
},
|
|
}
|
|
for _, test := range tests {
|
|
client := &client.FakeRESTClient{
|
|
Codec: testapi.Codec(),
|
|
Resp: test.Resp,
|
|
Err: test.HttpErr,
|
|
}
|
|
modifier := &Helper{
|
|
RESTClient: client,
|
|
NamespaceScoped: true,
|
|
}
|
|
err := modifier.Delete("bar", "foo")
|
|
if (err != nil) != test.Err {
|
|
t.Errorf("unexpected error: %t %v", test.Err, err)
|
|
}
|
|
if err != nil {
|
|
continue
|
|
}
|
|
if test.Req != nil && !test.Req(client.Req) {
|
|
t.Errorf("unexpected request: %#v", client.Req)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestHelperCreate(t *testing.T) {
|
|
expectPost := func(req *http.Request) bool {
|
|
if req.Method != "POST" {
|
|
t.Errorf("unexpected method: %#v", req)
|
|
return false
|
|
}
|
|
parts := splitPath(req.URL.Path)
|
|
if parts[1] != "bar" {
|
|
t.Errorf("url doesn't contain namespace: %#v", req)
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
|
|
grace := int64(30)
|
|
tests := []struct {
|
|
Resp *http.Response
|
|
RespFunc client.HTTPClientFunc
|
|
HttpErr error
|
|
Modify bool
|
|
Object runtime.Object
|
|
|
|
ExpectObject runtime.Object
|
|
Err bool
|
|
Req func(*http.Request) bool
|
|
}{
|
|
{
|
|
HttpErr: errors.New("failure"),
|
|
Err: true,
|
|
},
|
|
{
|
|
Resp: &http.Response{
|
|
StatusCode: http.StatusNotFound,
|
|
Body: objBody(&api.Status{Status: api.StatusFailure}),
|
|
},
|
|
Err: true,
|
|
},
|
|
{
|
|
Resp: &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: objBody(&api.Status{Status: api.StatusSuccess}),
|
|
},
|
|
Object: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}},
|
|
ExpectObject: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}},
|
|
Req: expectPost,
|
|
},
|
|
{
|
|
Modify: false,
|
|
Object: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}},
|
|
ExpectObject: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}},
|
|
Resp: &http.Response{StatusCode: http.StatusOK, Body: objBody(&api.Status{Status: api.StatusSuccess})},
|
|
Req: expectPost,
|
|
},
|
|
{
|
|
Modify: true,
|
|
Object: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}},
|
|
ExpectObject: &api.Pod{
|
|
ObjectMeta: api.ObjectMeta{Name: "foo"},
|
|
Spec: api.PodSpec{
|
|
RestartPolicy: api.RestartPolicyAlways,
|
|
DNSPolicy: api.DNSClusterFirst,
|
|
TerminationGracePeriodSeconds: &grace,
|
|
},
|
|
},
|
|
Resp: &http.Response{StatusCode: http.StatusOK, Body: objBody(&api.Status{Status: api.StatusSuccess})},
|
|
Req: expectPost,
|
|
},
|
|
}
|
|
for i, test := range tests {
|
|
client := &client.FakeRESTClient{
|
|
Codec: testapi.Codec(),
|
|
Resp: test.Resp,
|
|
Err: test.HttpErr,
|
|
}
|
|
if test.RespFunc != nil {
|
|
client.Client = test.RespFunc
|
|
}
|
|
modifier := &Helper{
|
|
RESTClient: client,
|
|
Codec: testapi.Codec(),
|
|
Versioner: testapi.MetadataAccessor(),
|
|
NamespaceScoped: true,
|
|
}
|
|
data := []byte{}
|
|
if test.Object != nil {
|
|
data = []byte(runtime.EncodeOrDie(testapi.Codec(), test.Object))
|
|
}
|
|
_, err := modifier.Create("bar", test.Modify, data)
|
|
if (err != nil) != test.Err {
|
|
t.Errorf("%d: unexpected error: %t %v", i, test.Err, err)
|
|
}
|
|
if err != nil {
|
|
continue
|
|
}
|
|
if test.Req != nil && !test.Req(client.Req) {
|
|
t.Errorf("%d: unexpected request: %#v", i, client.Req)
|
|
}
|
|
body, err := ioutil.ReadAll(client.Req.Body)
|
|
if err != nil {
|
|
t.Fatalf("%d: unexpected error: %#v", i, err)
|
|
}
|
|
t.Logf("got body: %s", string(body))
|
|
expect := []byte{}
|
|
if test.ExpectObject != nil {
|
|
expect = []byte(runtime.EncodeOrDie(testapi.Codec(), test.ExpectObject))
|
|
}
|
|
if !reflect.DeepEqual(expect, body) {
|
|
t.Errorf("%d: unexpected body: %s", i, string(body))
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
func TestHelperGet(t *testing.T) {
|
|
tests := []struct {
|
|
Err bool
|
|
Req func(*http.Request) bool
|
|
Resp *http.Response
|
|
HttpErr error
|
|
}{
|
|
{
|
|
HttpErr: errors.New("failure"),
|
|
Err: true,
|
|
},
|
|
{
|
|
Resp: &http.Response{
|
|
StatusCode: http.StatusNotFound,
|
|
Body: objBody(&api.Status{Status: api.StatusFailure}),
|
|
},
|
|
Err: true,
|
|
},
|
|
{
|
|
Resp: &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: objBody(&api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}),
|
|
},
|
|
Req: func(req *http.Request) bool {
|
|
if req.Method != "GET" {
|
|
t.Errorf("unexpected method: %#v", req)
|
|
return false
|
|
}
|
|
parts := splitPath(req.URL.Path)
|
|
if parts[1] != "bar" {
|
|
t.Errorf("url doesn't contain namespace: %#v", req)
|
|
return false
|
|
}
|
|
if parts[2] != "foo" {
|
|
t.Errorf("url doesn't contain name: %#v", req)
|
|
return false
|
|
}
|
|
return true
|
|
},
|
|
},
|
|
}
|
|
for _, test := range tests {
|
|
client := &client.FakeRESTClient{
|
|
Codec: testapi.Codec(),
|
|
Resp: test.Resp,
|
|
Err: test.HttpErr,
|
|
}
|
|
modifier := &Helper{
|
|
RESTClient: client,
|
|
NamespaceScoped: true,
|
|
}
|
|
obj, err := modifier.Get("bar", "foo")
|
|
if (err != nil) != test.Err {
|
|
t.Errorf("unexpected error: %t %v", test.Err, err)
|
|
}
|
|
if err != nil {
|
|
continue
|
|
}
|
|
if obj.(*api.Pod).Name != "foo" {
|
|
t.Errorf("unexpected object: %#v", obj)
|
|
}
|
|
if test.Req != nil && !test.Req(client.Req) {
|
|
t.Errorf("unexpected request: %#v", client.Req)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestHelperList(t *testing.T) {
|
|
tests := []struct {
|
|
Err bool
|
|
Req func(*http.Request) bool
|
|
Resp *http.Response
|
|
HttpErr error
|
|
}{
|
|
{
|
|
HttpErr: errors.New("failure"),
|
|
Err: true,
|
|
},
|
|
{
|
|
Resp: &http.Response{
|
|
StatusCode: http.StatusNotFound,
|
|
Body: objBody(&api.Status{Status: api.StatusFailure}),
|
|
},
|
|
Err: true,
|
|
},
|
|
{
|
|
Resp: &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: objBody(&api.PodList{
|
|
Items: []api.Pod{{
|
|
ObjectMeta: api.ObjectMeta{Name: "foo"},
|
|
},
|
|
},
|
|
}),
|
|
},
|
|
Req: func(req *http.Request) bool {
|
|
if req.Method != "GET" {
|
|
t.Errorf("unexpected method: %#v", req)
|
|
return false
|
|
}
|
|
if req.URL.Path != "/namespaces/bar" {
|
|
t.Errorf("url doesn't contain name: %#v", req.URL)
|
|
return false
|
|
}
|
|
if req.URL.Query().Get(api.LabelSelectorQueryParam(testapi.Version())) != labels.SelectorFromSet(labels.Set{"foo": "baz"}).String() {
|
|
t.Errorf("url doesn't contain query parameters: %#v", req.URL)
|
|
return false
|
|
}
|
|
return true
|
|
},
|
|
},
|
|
}
|
|
for _, test := range tests {
|
|
client := &client.FakeRESTClient{
|
|
Codec: testapi.Codec(),
|
|
Resp: test.Resp,
|
|
Err: test.HttpErr,
|
|
}
|
|
modifier := &Helper{
|
|
RESTClient: client,
|
|
NamespaceScoped: true,
|
|
}
|
|
obj, err := modifier.List("bar", testapi.Version(), labels.SelectorFromSet(labels.Set{"foo": "baz"}))
|
|
if (err != nil) != test.Err {
|
|
t.Errorf("unexpected error: %t %v", test.Err, err)
|
|
}
|
|
if err != nil {
|
|
continue
|
|
}
|
|
if obj.(*api.PodList).Items[0].Name != "foo" {
|
|
t.Errorf("unexpected object: %#v", obj)
|
|
}
|
|
if test.Req != nil && !test.Req(client.Req) {
|
|
t.Errorf("unexpected request: %#v", client.Req)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestHelperUpdate(t *testing.T) {
|
|
expectPut := func(req *http.Request) bool {
|
|
if req.Method != "PUT" {
|
|
t.Errorf("unexpected method: %#v", req)
|
|
return false
|
|
}
|
|
parts := splitPath(req.URL.Path)
|
|
if parts[1] != "bar" {
|
|
t.Errorf("url doesn't contain namespace: %#v", req.URL)
|
|
return false
|
|
}
|
|
if parts[2] != "foo" {
|
|
t.Errorf("url doesn't contain name: %#v", req)
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
|
|
grace := int64(30)
|
|
tests := []struct {
|
|
Resp *http.Response
|
|
RespFunc client.HTTPClientFunc
|
|
HttpErr error
|
|
Overwrite bool
|
|
Object runtime.Object
|
|
|
|
ExpectObject runtime.Object
|
|
Err bool
|
|
Req func(*http.Request) bool
|
|
}{
|
|
{
|
|
HttpErr: errors.New("failure"),
|
|
Err: true,
|
|
},
|
|
{
|
|
Object: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}},
|
|
Resp: &http.Response{
|
|
StatusCode: http.StatusNotFound,
|
|
Body: objBody(&api.Status{Status: api.StatusFailure}),
|
|
},
|
|
Err: true,
|
|
},
|
|
{
|
|
Object: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}},
|
|
ExpectObject: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}},
|
|
Resp: &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: objBody(&api.Status{Status: api.StatusSuccess}),
|
|
},
|
|
Req: expectPut,
|
|
},
|
|
{
|
|
Object: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}},
|
|
ExpectObject: &api.Pod{
|
|
ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"},
|
|
Spec: api.PodSpec{
|
|
RestartPolicy: api.RestartPolicyAlways,
|
|
DNSPolicy: api.DNSClusterFirst,
|
|
TerminationGracePeriodSeconds: &grace,
|
|
},
|
|
},
|
|
Overwrite: true,
|
|
RespFunc: func(req *http.Request) (*http.Response, error) {
|
|
if req.Method == "PUT" {
|
|
return &http.Response{StatusCode: http.StatusOK, Body: objBody(&api.Status{Status: api.StatusSuccess})}, nil
|
|
}
|
|
return &http.Response{StatusCode: http.StatusOK, Body: objBody(&api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}})}, nil
|
|
},
|
|
Req: expectPut,
|
|
},
|
|
{
|
|
Object: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}},
|
|
ExpectObject: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}},
|
|
Resp: &http.Response{StatusCode: http.StatusOK, Body: objBody(&api.Status{Status: api.StatusSuccess})},
|
|
Req: expectPut,
|
|
},
|
|
}
|
|
for i, test := range tests {
|
|
client := &client.FakeRESTClient{
|
|
Codec: testapi.Codec(),
|
|
Resp: test.Resp,
|
|
Err: test.HttpErr,
|
|
}
|
|
if test.RespFunc != nil {
|
|
client.Client = test.RespFunc
|
|
}
|
|
modifier := &Helper{
|
|
RESTClient: client,
|
|
Codec: testapi.Codec(),
|
|
Versioner: testapi.MetadataAccessor(),
|
|
NamespaceScoped: true,
|
|
}
|
|
data := []byte{}
|
|
if test.Object != nil {
|
|
data = []byte(runtime.EncodeOrDie(testapi.Codec(), test.Object))
|
|
}
|
|
_, err := modifier.Update("bar", "foo", test.Overwrite, data)
|
|
if (err != nil) != test.Err {
|
|
t.Errorf("%d: unexpected error: %t %v", i, test.Err, err)
|
|
}
|
|
if err != nil {
|
|
continue
|
|
}
|
|
if test.Req != nil && !test.Req(client.Req) {
|
|
t.Errorf("%d: unexpected request: %#v", i, client.Req)
|
|
}
|
|
body, err := ioutil.ReadAll(client.Req.Body)
|
|
if err != nil {
|
|
t.Fatalf("%d: unexpected error: %#v", i, err)
|
|
}
|
|
t.Logf("got body: %s", string(body))
|
|
expect := []byte{}
|
|
if test.ExpectObject != nil {
|
|
expect = []byte(runtime.EncodeOrDie(testapi.Codec(), test.ExpectObject))
|
|
}
|
|
if !reflect.DeepEqual(expect, body) {
|
|
t.Errorf("%d: unexpected body: %s", i, string(body))
|
|
}
|
|
}
|
|
}
|