Merge pull request #7432 from piosz/termination_notice

Added TerminationGracePeriod field to PodSpec and grace-period flag to kubectl stop

pkg/kubectl/cmd/delete.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"
 	cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
@@ -73,6 +74,7 @@ func NewCmdDelete(f *cmdutil.Factory, out io.Writer) *cobra.Command {
 	cmd.Flags().StringP("selector", "l", "", "Selector (label query) to filter on")
 	cmd.Flags().Bool("all", false, "[-all] to select all the specified resources")
 	cmd.Flags().Bool("cascade", true, "If true, cascade the delete resources managed by this resource (e.g. Pods created by a ReplicationController).  Default true.")
+	cmd.Flags().Int("grace-period", -1, "Period of time in seconds given to the resource to terminate gracefully. Ignored if negative.")
 	return cmd
 }
 
@@ -98,12 +100,12 @@ func RunDelete(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str
 
 	// By default use a reaper to delete all related resources.
 	if cmdutil.GetFlagBool(cmd, "cascade") {
-		return ReapResult(r, f, out, cmdutil.GetFlagBool(cmd, "cascade"))
+		return ReapResult(r, f, out, cmdutil.GetFlagBool(cmd, "cascade"), cmdutil.GetFlagInt(cmd, "grace-period"))
 	}
 	return DeleteResult(r, out)
 }
 
-func ReapResult(r *resource.Result, f *cmdutil.Factory, out io.Writer, isDefaultDelete bool) error {
+func ReapResult(r *resource.Result, f *cmdutil.Factory, out io.Writer, isDefaultDelete bool, gracePeriod int) error {
 	found := 0
 	err := r.IgnoreErrors(errors.IsNotFound).Visit(func(info *resource.Info) error {
 		found++
@@ -115,7 +117,11 @@ func ReapResult(r *resource.Result, f *cmdutil.Factory, out io.Writer, isDefault
 			}
 			return err
 		}
-		if _, err := reaper.Stop(info.Namespace, info.Name); err != nil {
+		var options *api.DeleteOptions
+		if gracePeriod >= 0 {
+			options = api.NewDeleteOptions(int64(gracePeriod))
+		}
+		if _, err := reaper.Stop(info.Namespace, info.Name, options); err != nil {
 			return err
 		}
 		fmt.Fprintf(out, "%s/%s\n", info.Mapping.Resource, info.Name)

pkg/kubectl/cmd/rollingupdate.go

@@ -345,7 +345,7 @@ func addDeploymentKeyToReplicationController(oldRc *api.ReplicationController, c
 	for ix := range podList.Items {
 		pod := &podList.Items[ix]
 		if value, found := pod.Labels[deploymentKey]; !found || value != oldHash {
-			if err := client.Pods(namespace).Delete(pod.Name); err != nil {
+			if err := client.Pods(namespace).Delete(pod.Name, nil); err != nil {
 				return err
 			}
 		}

pkg/kubectl/cmd/stop.go

@@ -61,6 +61,7 @@ func NewCmdStop(f *cmdutil.Factory, out io.Writer) *cobra.Command {
 	kubectl.AddJsonFilenameFlag(cmd, &flags.Filenames, usage)
 	cmd.Flags().StringP("selector", "l", "", "Selector (label query) to filter on")
 	cmd.Flags().Bool("all", false, "[-all] to select all the specified resources")
+	cmd.Flags().Int("grace-period", -1, "Period of time in seconds given to the resource to terminate gracefully. Ignored if negative.")
 	return cmd
 }
 
@@ -82,5 +83,5 @@ func RunStop(f *cmdutil.Factory, cmd *cobra.Command, args []string, filenames ut
 	if r.Err() != nil {
 		return r.Err()
 	}
-	return ReapResult(r, f, out, false)
+	return ReapResult(r, f, out, false, cmdutil.GetFlagInt(cmd, "grace-period"))
 }

pkg/kubectl/stop.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 )
@@ -32,7 +33,7 @@ const (
 
 // A Reaper handles terminating an object as gracefully as possible.
 type Reaper interface {
-	Stop(namespace, name string) (string, error)
+	Stop(namespace, name string, gracePeriod *api.DeleteOptions) (string, error)
 }
 
 type NoSuchReaperError struct {
@@ -76,7 +77,7 @@ type objInterface interface {
 	Get(name string) (meta.Interface, error)
 }
 
-func (reaper *ReplicationControllerReaper) Stop(namespace, name string) (string, error) {
+func (reaper *ReplicationControllerReaper) Stop(namespace, name string, gracePeriod *api.DeleteOptions) (string, error) {
 	rc := reaper.ReplicationControllers(namespace)
 	resizer, err := ResizerFor("ReplicationController", NewResizerClient(*reaper))
 	if err != nil {
@@ -91,19 +92,20 @@ func (reaper *ReplicationControllerReaper) Stop(namespace, name string) (string,
 	return fmt.Sprintf("%s stopped", name), nil
 }
 
-func (reaper *PodReaper) Stop(namespace, name string) (string, error) {
+func (reaper *PodReaper) Stop(namespace, name string, gracePeriod *api.DeleteOptions) (string, error) {
 	pods := reaper.Pods(namespace)
 	_, err := pods.Get(name)
 	if err != nil {
 		return "", err
 	}
-	if err := pods.Delete(name); err != nil {
+	if err := pods.Delete(name, gracePeriod); err != nil {
 		return "", err
 	}
+
 	return fmt.Sprintf("%s stopped", name), nil
 }
 
-func (reaper *ServiceReaper) Stop(namespace, name string) (string, error) {
+func (reaper *ServiceReaper) Stop(namespace, name string, gracePeriod *api.DeleteOptions) (string, error) {
 	services := reaper.Services(namespace)
 	_, err := services.Get(name)
 	if err != nil {

pkg/kubectl/stop_test.go

@@ -34,7 +34,7 @@ func TestReplicationControllerStop(t *testing.T) {
 	})
 	reaper := ReplicationControllerReaper{fake, time.Millisecond, time.Millisecond}
 	name := "foo"
-	s, err := reaper.Stop("default", name)
+	s, err := reaper.Stop("default", name, nil)
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
@@ -142,7 +142,7 @@ func TestSimpleStop(t *testing.T) {
 		if err != nil {
 			t.Errorf("unexpected error: %v (%s)", err, test.test)
 		}
-		s, err := reaper.Stop("default", "foo")
+		s, err := reaper.Stop("default", "foo", nil)
 		if err != nil && !test.expectError {
 			t.Errorf("unexpected error: %v (%s)", err, test.test)
 		}