@@ -8471,10 +8471,6 @@ _oc_deploy()

     flags_with_completion=()

     flags_completion=()

-    flags+=("--cancel")

-    local_nonpersistent_flags+=("--cancel")

-    flags+=("--enable-triggers")

-    local_nonpersistent_flags+=("--enable-triggers")

     flags+=("--follow")

     local_nonpersistent_flags+=("--follow")

     flags+=("--retry")

@@ -11856,6 +11852,59 @@ _oc_rollback()

     noun_aliases=()

 }

+_oc_rollout_cancel()

+{

+    last_command="oc_rollout_cancel"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    local_nonpersistent_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+    flags+=("--filename=")

+    flags_with_completion+=("--filename")

+    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")

+    two_word_flags+=("-f")

+    flags_with_completion+=("-f")

+    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")

+    local_nonpersistent_flags+=("--filename=")

+    flags+=("--recursive")

+    flags+=("-R")

+    local_nonpersistent_flags+=("--recursive")

+    flags+=("--as=")

+    flags+=("--certificate-authority=")

+    flags_with_completion+=("--certificate-authority")

+    flags_completion+=("_filedir")

+    flags+=("--client-certificate=")

+    flags_with_completion+=("--client-certificate")

+    flags_completion+=("_filedir")

+    flags+=("--client-key=")

+    flags_with_completion+=("--client-key")

+    flags_completion+=("_filedir")

+    flags+=("--cluster=")

+    flags+=("--config=")

+    flags_with_completion+=("--config")

+    flags_completion+=("_filedir")

+    flags+=("--context=")

+    flags+=("--insecure-skip-tls-verify")

+    flags+=("--log-flush-frequency=")

+    flags+=("--loglevel=")

+    flags+=("--logspec=")

+    flags+=("--match-server-version")

+    flags+=("--namespace=")

+    two_word_flags+=("-n")

+    flags+=("--request-timeout=")

+    flags+=("--server=")

+    flags+=("--token=")

+    flags+=("--user=")

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+    noun_aliases=()

+}

+

 _oc_rollout_history()

 {

     last_command="oc_rollout_history"

@@ -12216,6 +12265,7 @@ _oc_rollout()

 {

     last_command="oc_rollout"

     commands=()

+    commands+=("cancel")

     commands+=("history")

     commands+=("latest")

     commands+=("pause")

@@ -13098,10 +13098,6 @@ _openshift_cli_deploy()

     flags_with_completion=()

     flags_completion=()

-    flags+=("--cancel")

-    local_nonpersistent_flags+=("--cancel")

-    flags+=("--enable-triggers")

-    local_nonpersistent_flags+=("--enable-triggers")

     flags+=("--follow")

     local_nonpersistent_flags+=("--follow")

     flags+=("--retry")

@@ -16526,6 +16522,60 @@ _openshift_cli_rollback()

     noun_aliases=()

 }

+_openshift_cli_rollout_cancel()

+{

+    last_command="openshift_cli_rollout_cancel"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    local_nonpersistent_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+    flags+=("--filename=")

+    flags_with_completion+=("--filename")

+    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")

+    two_word_flags+=("-f")

+    flags_with_completion+=("-f")

+    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")

+    local_nonpersistent_flags+=("--filename=")

+    flags+=("--recursive")

+    flags+=("-R")

+    local_nonpersistent_flags+=("--recursive")

+    flags+=("--as=")

+    flags+=("--certificate-authority=")

+    flags_with_completion+=("--certificate-authority")

+    flags_completion+=("_filedir")

+    flags+=("--client-certificate=")

+    flags_with_completion+=("--client-certificate")

+    flags_completion+=("_filedir")

+    flags+=("--client-key=")

+    flags_with_completion+=("--client-key")

+    flags_completion+=("_filedir")

+    flags+=("--cluster=")

+    flags+=("--config=")

+    flags_with_completion+=("--config")

+    flags_completion+=("_filedir")

+    flags+=("--context=")

+    flags+=("--google-json-key=")

+    flags+=("--insecure-skip-tls-verify")

+    flags+=("--log-flush-frequency=")

+    flags+=("--loglevel=")

+    flags+=("--logspec=")

+    flags+=("--match-server-version")

+    flags+=("--namespace=")

+    two_word_flags+=("-n")

+    flags+=("--request-timeout=")

+    flags+=("--server=")

+    flags+=("--token=")

+    flags+=("--user=")

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+    noun_aliases=()

+}

+

 _openshift_cli_rollout_history()

 {

     last_command="openshift_cli_rollout_history"

@@ -16892,6 +16942,7 @@ _openshift_cli_rollout()

 {

     last_command="openshift_cli_rollout"

     commands=()

+    commands+=("cancel")

     commands+=("history")

     commands+=("latest")

     commands+=("pause")

@@ -8632,10 +8632,6 @@ _oc_deploy()

     flags_with_completion=()

     flags_completion=()

-    flags+=("--cancel")

-    local_nonpersistent_flags+=("--cancel")

-    flags+=("--enable-triggers")

-    local_nonpersistent_flags+=("--enable-triggers")

     flags+=("--follow")

     local_nonpersistent_flags+=("--follow")

     flags+=("--retry")

@@ -12017,6 +12013,59 @@ _oc_rollback()

     noun_aliases=()

 }

+_oc_rollout_cancel()

+{

+    last_command="oc_rollout_cancel"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    local_nonpersistent_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+    flags+=("--filename=")

+    flags_with_completion+=("--filename")

+    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")

+    two_word_flags+=("-f")

+    flags_with_completion+=("-f")

+    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")

+    local_nonpersistent_flags+=("--filename=")

+    flags+=("--recursive")

+    flags+=("-R")

+    local_nonpersistent_flags+=("--recursive")

+    flags+=("--as=")

+    flags+=("--certificate-authority=")

+    flags_with_completion+=("--certificate-authority")

+    flags_completion+=("_filedir")

+    flags+=("--client-certificate=")

+    flags_with_completion+=("--client-certificate")

+    flags_completion+=("_filedir")

+    flags+=("--client-key=")

+    flags_with_completion+=("--client-key")

+    flags_completion+=("_filedir")

+    flags+=("--cluster=")

+    flags+=("--config=")

+    flags_with_completion+=("--config")

+    flags_completion+=("_filedir")

+    flags+=("--context=")

+    flags+=("--insecure-skip-tls-verify")

+    flags+=("--log-flush-frequency=")

+    flags+=("--loglevel=")

+    flags+=("--logspec=")

+    flags+=("--match-server-version")

+    flags+=("--namespace=")

+    two_word_flags+=("-n")

+    flags+=("--request-timeout=")

+    flags+=("--server=")

+    flags+=("--token=")

+    flags+=("--user=")

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+    noun_aliases=()

+}

+

 _oc_rollout_history()

 {

     last_command="oc_rollout_history"

@@ -12377,6 +12426,7 @@ _oc_rollout()

 {

     last_command="oc_rollout"

     commands=()

+    commands+=("cancel")

     commands+=("history")

     commands+=("latest")

     commands+=("pause")

@@ -13259,10 +13259,6 @@ _openshift_cli_deploy()

     flags_with_completion=()

     flags_completion=()

-    flags+=("--cancel")

-    local_nonpersistent_flags+=("--cancel")

-    flags+=("--enable-triggers")

-    local_nonpersistent_flags+=("--enable-triggers")

     flags+=("--follow")

     local_nonpersistent_flags+=("--follow")

     flags+=("--retry")

@@ -16687,6 +16683,60 @@ _openshift_cli_rollback()

     noun_aliases=()

 }

+_openshift_cli_rollout_cancel()

+{

+    last_command="openshift_cli_rollout_cancel"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    local_nonpersistent_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+    flags+=("--filename=")

+    flags_with_completion+=("--filename")

+    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")

+    two_word_flags+=("-f")

+    flags_with_completion+=("-f")

+    flags_completion+=("__handle_filename_extension_flag json|yaml|yml")

+    local_nonpersistent_flags+=("--filename=")

+    flags+=("--recursive")

+    flags+=("-R")

+    local_nonpersistent_flags+=("--recursive")

+    flags+=("--as=")

+    flags+=("--certificate-authority=")

+    flags_with_completion+=("--certificate-authority")

+    flags_completion+=("_filedir")

+    flags+=("--client-certificate=")

+    flags_with_completion+=("--client-certificate")

+    flags_completion+=("_filedir")

+    flags+=("--client-key=")

+    flags_with_completion+=("--client-key")

+    flags_completion+=("_filedir")

+    flags+=("--cluster=")

+    flags+=("--config=")

+    flags_with_completion+=("--config")

+    flags_completion+=("_filedir")

+    flags+=("--context=")

+    flags+=("--google-json-key=")

+    flags+=("--insecure-skip-tls-verify")

+    flags+=("--log-flush-frequency=")

+    flags+=("--loglevel=")

+    flags+=("--logspec=")

+    flags+=("--match-server-version")

+    flags+=("--namespace=")

+    two_word_flags+=("-n")

+    flags+=("--request-timeout=")

+    flags+=("--server=")

+    flags+=("--token=")

+    flags+=("--user=")

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+    noun_aliases=()

+}

+

 _openshift_cli_rollout_history()

 {

     last_command="openshift_cli_rollout_history"

@@ -17053,6 +17103,7 @@ _openshift_cli_rollout()

 {

     last_command="openshift_cli_rollout"

     commands=()

+    commands+=("cancel")

     commands+=("history")

     commands+=("latest")

     commands+=("pause")

@@ -2159,6 +2159,19 @@ Revert part of an application back to a previous deployment

 ====

+== oc rollout cancel

+cancel the in-progress deployment

+

+====

+

+[options="nowrap"]

+----

+  # Cancel the in-progress deployment based on 'nginx'

+  oc rollout cancel dc/nginx

+----

+====

+

+

 == oc rollout history

 View rollout history

@@ -182,6 +182,7 @@ oc-projects.1

 oc-proxy.1

 oc-replace.1

 oc-rollback.1

+oc-rollout-cancel.1

 oc-rollout-history.1

 oc-rollout-latest.1

 oc-rollout-pause.1

@@ -271,6 +271,7 @@ openshift-cli-projects.1

 openshift-cli-proxy.1

 openshift-cli-replace.1

 openshift-cli-rollback.1

+openshift-cli-rollout-cancel.1

 openshift-cli-rollout-history.1

 openshift-cli-rollout-latest.1

 openshift-cli-rollout-pause.1

new file mode 100644

@@ -0,0 +1,121 @@

+.TH "OC ROLLOUT" "1" " Openshift CLI User Manuals" "Openshift" "June 2016"  ""

+

+

+.SH NAME

+.PP

+oc rollout cancel \- cancel the in\-progress deployment

+

+

+.SH SYNOPSIS

+.PP

+\fBoc rollout cancel\fP [OPTIONS]

+

+

+.SH DESCRIPTION

+.PP

+Cancel the in\-progress deployment

+

+.PP

+Running this command will cause the current in\-progress deployment to be cancelled, but keep in mind that this is a best\-effort operation and may take some time to complete. It’s possible the deployment will partially or totally complete before the cancellation is effective. In such a case an appropriate event will be emitted.

+

+

+.SH OPTIONS

+.PP

+\fB\-f\fP, \fB\-\-filename\fP=[]

+    Filename, directory, or URL to a file identifying the resource to get from a server.

+

+.PP

+\fB\-R\fP, \fB\-\-recursive\fP=false

+    Process the directory used in \-f, \-\-filename recursively. Useful when you want to manage related manifests organized within the same directory.

+

+

+.SH OPTIONS INHERITED FROM PARENT COMMANDS

+.PP

+\fB\-\-api\-version\fP=""

+    DEPRECATED: The API version to use when talking to the server

+

+.PP

+\fB\-\-as\fP=""

+    Username to impersonate for the operation

+

+.PP

+\fB\-\-certificate\-authority\fP=""

+    Path to a cert. file for the certificate authority

+

+.PP

+\fB\-\-client\-certificate\fP=""

+    Path to a client certificate file for TLS

+

+.PP

+\fB\-\-client\-key\fP=""

+    Path to a client key file for TLS

+

+.PP

+\fB\-\-cluster\fP=""

+    The name of the kubeconfig cluster to use

+

+.PP

+\fB\-\-config\fP=""

+    Path to the config file to use for CLI requests.

+

+.PP

+\fB\-\-context\fP=""

+    The name of the kubeconfig context to use

+

+.PP

+\fB\-\-google\-json\-key\fP=""

+    The Google Cloud Platform Service Account JSON Key to use for authentication.

+

+.PP

+\fB\-\-insecure\-skip\-tls\-verify\fP=false

+    If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure

+

+.PP

+\fB\-\-log\-flush\-frequency\fP=0

+    Maximum number of seconds between log flushes

+

+.PP

+\fB\-\-match\-server\-version\fP=false

+    Require server version to match client version

+

+.PP

+\fB\-n\fP, \fB\-\-namespace\fP=""

+    If present, the namespace scope for this CLI request

+

+.PP

+\fB\-\-request\-timeout\fP="0"

+    The length of time to wait before giving up on a single server request. Non\-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests.

+

+.PP

+\fB\-\-server\fP=""

+    The address and port of the Kubernetes API server

+

+.PP

+\fB\-\-token\fP=""

+    Bearer token for authentication to the API server

+

+.PP

+\fB\-\-user\fP=""

+    The name of the kubeconfig user to use

+

+

+.SH EXAMPLE

+.PP

+.RS

+

+.nf

+  # Cancel the in\-progress deployment based on 'nginx'

+  oc rollout cancel dc/nginx

+

+.fi

+.RE

+

+

+.SH SEE ALSO

+.PP

+\fBoc\-rollout(1)\fP,

+

+

+.SH HISTORY

+.PP

+June 2016, Ported from the Kubernetes man\-doc generator

@@ -103,7 +103,7 @@ There are several deployment strategies defined:

 .SH SEE ALSO

 .PP

-\fBoc(1)\fP, \fBoc\-rollout\-history(1)\fP, \fBoc\-rollout\-latest(1)\fP, \fBoc\-rollout\-pause(1)\fP, \fBoc\-rollout\-resume(1)\fP, \fBoc\-rollout\-status(1)\fP, \fBoc\-rollout\-undo(1)\fP,

+\fBoc(1)\fP, \fBoc\-rollout\-cancel(1)\fP, \fBoc\-rollout\-history(1)\fP, \fBoc\-rollout\-latest(1)\fP, \fBoc\-rollout\-pause(1)\fP, \fBoc\-rollout\-resume(1)\fP, \fBoc\-rollout\-status(1)\fP, \fBoc\-rollout\-undo(1)\fP,

 .SH HISTORY

new file mode 100644

@@ -0,0 +1,121 @@

+.TH "OPENSHIFT CLI ROLLOUT" "1" " Openshift CLI User Manuals" "Openshift" "June 2016"  ""

+

+

+.SH NAME

+.PP

+openshift cli rollout cancel \- cancel the in\-progress deployment

+

+

+.SH SYNOPSIS

+.PP

+\fBopenshift cli rollout cancel\fP [OPTIONS]

+

+

+.SH DESCRIPTION

+.PP

+Cancel the in\-progress deployment

+

+.PP

+Running this command will cause the current in\-progress deployment to be cancelled, but keep in mind that this is a best\-effort operation and may take some time to complete. It’s possible the deployment will partially or totally complete before the cancellation is effective. In such a case an appropriate event will be emitted.

+

+

+.SH OPTIONS

+.PP

+\fB\-f\fP, \fB\-\-filename\fP=[]

+    Filename, directory, or URL to a file identifying the resource to get from a server.

+

+.PP

+\fB\-R\fP, \fB\-\-recursive\fP=false

+    Process the directory used in \-f, \-\-filename recursively. Useful when you want to manage related manifests organized within the same directory.

+

+

+.SH OPTIONS INHERITED FROM PARENT COMMANDS

+.PP

+\fB\-\-api\-version\fP=""

+    DEPRECATED: The API version to use when talking to the server

+

+.PP

+\fB\-\-as\fP=""

+    Username to impersonate for the operation

+

+.PP

+\fB\-\-certificate\-authority\fP=""

+    Path to a cert. file for the certificate authority

+

+.PP

+\fB\-\-client\-certificate\fP=""

+    Path to a client certificate file for TLS

+

+.PP

+\fB\-\-client\-key\fP=""

+    Path to a client key file for TLS

+

+.PP

+\fB\-\-cluster\fP=""

+    The name of the kubeconfig cluster to use

+

+.PP

+\fB\-\-config\fP=""

+    Path to the config file to use for CLI requests.

+

+.PP

+\fB\-\-context\fP=""

+    The name of the kubeconfig context to use

+

+.PP

+\fB\-\-google\-json\-key\fP=""

+    The Google Cloud Platform Service Account JSON Key to use for authentication.

+

+.PP

+\fB\-\-insecure\-skip\-tls\-verify\fP=false

+    If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure

+

+.PP

+\fB\-\-log\-flush\-frequency\fP=0

+    Maximum number of seconds between log flushes

+

+.PP

+\fB\-\-match\-server\-version\fP=false

+    Require server version to match client version

+

+.PP

+\fB\-n\fP, \fB\-\-namespace\fP=""

+    If present, the namespace scope for this CLI request

+

+.PP

+\fB\-\-request\-timeout\fP="0"

+    The length of time to wait before giving up on a single server request. Non\-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests.

+

+.PP

+\fB\-\-server\fP=""

+    The address and port of the Kubernetes API server

+

+.PP

+\fB\-\-token\fP=""

+    Bearer token for authentication to the API server

+

+.PP

+\fB\-\-user\fP=""

+    The name of the kubeconfig user to use

+

+

+.SH EXAMPLE

+.PP

+.RS

+

+.nf

+  # Cancel the in\-progress deployment based on 'nginx'

+  openshift cli rollout cancel dc/nginx

+

+.fi

+.RE

+

+

+.SH SEE ALSO

+.PP

+\fBopenshift\-cli\-rollout(1)\fP,

+

+

+.SH HISTORY

+.PP

+June 2016, Ported from the Kubernetes man\-doc generator

@@ -103,7 +103,7 @@ There are several deployment strategies defined:

 .SH SEE ALSO

 .PP

-\fBopenshift\-cli(1)\fP, \fBopenshift\-cli\-rollout\-history(1)\fP, \fBopenshift\-cli\-rollout\-latest(1)\fP, \fBopenshift\-cli\-rollout\-pause(1)\fP, \fBopenshift\-cli\-rollout\-resume(1)\fP, \fBopenshift\-cli\-rollout\-status(1)\fP, \fBopenshift\-cli\-rollout\-undo(1)\fP,

+\fBopenshift\-cli(1)\fP, \fBopenshift\-cli\-rollout\-cancel(1)\fP, \fBopenshift\-cli\-rollout\-history(1)\fP, \fBopenshift\-cli\-rollout\-latest(1)\fP, \fBopenshift\-cli\-rollout\-pause(1)\fP, \fBopenshift\-cli\-rollout\-resume(1)\fP, \fBopenshift\-cli\-rollout\-status(1)\fP, \fBopenshift\-cli\-rollout\-undo(1)\fP,

 .SH HISTORY

@@ -124,7 +124,9 @@ func NewCmdDeploy(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.C

 	cmd.Flags().MarkDeprecated("latest", fmt.Sprintf("use '%s rollout latest' instead", fullName))

 	cmd.Flags().BoolVar(&options.retryDeploy, "retry", false, "Retry the latest failed deployment.")

 	cmd.Flags().BoolVar(&options.cancelDeploy, "cancel", false, "Cancel the in-progress deployment.")

+	cmd.Flags().MarkDeprecated("cancel", fmt.Sprintf("use '%s rollout cancel' instead", fullName))

 	cmd.Flags().BoolVar(&options.enableTriggers, "enable-triggers", false, "Enables all image triggers for the deployment config.")

+	cmd.Flags().MarkDeprecated("enable-triggers", fmt.Sprintf("use '%s set triggers' instead", fullName))

 	cmd.Flags().BoolVar(&options.follow, "follow", false, "Follow the logs of a deployment")

 	return cmd

@@ -241,8 +243,8 @@ func (o DeployOptions) deploy(config *deployapi.DeploymentConfig) error {

 	deployment, err := o.kubeClient.ReplicationControllers(config.Namespace).Get(deploymentName)

 	if err == nil && !deployutil.IsTerminatedDeployment(deployment) {

 		// Reject attempts to start a concurrent deployment.

-		return fmt.Errorf("#%d is already in progress (%s).\nOptionally, you can cancel this deployment using the --cancel option.",

-			config.Status.LatestVersion, deployutil.DeploymentStatusFor(deployment))

+		return fmt.Errorf("#%d is already in progress (%s).\nOptionally, you can cancel this deployment using 'oc rollout cancel dc/%s'.",

+			config.Status.LatestVersion, deployutil.DeploymentStatusFor(deployment), deployment.Name)

 	}

 	if err != nil && !kerrors.IsNotFound(err) {

 		return err

@@ -304,7 +306,7 @@ func (o DeployOptions) retry(config *deployapi.DeploymentConfig) error {

 		if deployutil.IsCompleteDeployment(deployment) {

 			message += fmt.Sprintf("You can start a new deployment with 'oc deploy --latest dc/%s'.", config.Name)

 		} else {

-			message += fmt.Sprintf("Optionally, you can cancel this deployment with 'oc deploy --cancel dc/%s'.", config.Name)

+			message += fmt.Sprintf("Optionally, you can cancel this deployment with 'oc rollout cancel dc/%s'.", config.Name)

 		}

 		return fmt.Errorf(message)

@@ -339,6 +341,7 @@ func (o DeployOptions) retry(config *deployapi.DeploymentConfig) error {

 }

 // cancel cancels any deployment process in progress for config.

+// TODO: this code will be deprecated

 func (o DeployOptions) cancel(config *deployapi.DeploymentConfig) error {

 	if config.Spec.Paused {

 		return fmt.Errorf("cannot cancel a paused deployment config")

new file mode 100644

@@ -0,0 +1,199 @@

+package rollout

+

+import (

+	"fmt"

+	"io"

+	"sort"

+	"strings"

+	"time"

+

+	"k8s.io/kubernetes/pkg/api/meta"

+	"k8s.io/kubernetes/pkg/kubectl"

+	"k8s.io/kubernetes/pkg/kubectl/resource"

+	"k8s.io/kubernetes/pkg/runtime"

+

+	units "github.com/docker/go-units"

+	"github.com/openshift/origin/pkg/cmd/templates"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

+	deployapi "github.com/openshift/origin/pkg/deploy/api"

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

+	"github.com/spf13/cobra"

+	kapi "k8s.io/kubernetes/pkg/api"

+	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

+	"k8s.io/kubernetes/pkg/kubectl/cmd/set"

+	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

+	utilerrors "k8s.io/kubernetes/pkg/util/errors"

+)

+

+type CancelOptions struct {

+	Mapper  meta.RESTMapper

+	Typer   runtime.ObjectTyper

+	Encoder runtime.Encoder

+	Infos   []*resource.Info

+

+	Filenames []string

+	Out       io.Writer

+	Recursive bool

+

+	Clientset *kclientset.Clientset

+}

+

+var (

+	rolloutCancelLong = templates.LongDesc(`

+Cancel the in-progress deployment

+

+Running this command will cause the current in-progress deployment to be

+cancelled, but keep in mind that this is a best-effort operation and may take

+some time to complete. It’s possible the deployment will partially or totally

+complete before the cancellation is effective. In such a case an appropriate

+event will be emitted.`)

+

+	rolloutCancelExample = templates.Examples(`

+	# Cancel the in-progress deployment based on 'nginx'

+  %[1]s rollout cancel dc/nginx`)

+)

+

+func NewCmdRolloutCancel(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Command {

+	opts := &CancelOptions{}

+	cmd := &cobra.Command{

+		Use:     "cancel (TYPE NAME | TYPE/NAME) [flags]",

+		Long:    rolloutCancelLong,

+		Example: fmt.Sprintf(rolloutCancelExample, fullName),

+		Short:   "cancel the in-progress deployment",

+		Run: func(cmd *cobra.Command, args []string) {

+			kcmdutil.CheckErr(opts.Complete(f, cmd, out, args))

+			kcmdutil.CheckErr(opts.Run())

+		},

+	}

+	usage := "Filename, directory, or URL to a file identifying the resource to get from a server."

+	kubectl.AddJsonFilenameFlag(cmd, &opts.Filenames, usage)

+	kcmdutil.AddRecursiveFlag(cmd, &opts.Recursive)

+	return cmd

+}

+

+func (o *CancelOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, args []string) error {

+	if len(args) == 0 && len(o.Filenames) == 0 {

+		return kcmdutil.UsageError(cmd, cmd.Use)

+	}

+

+	o.Mapper, o.Typer = f.Object(false)

+	o.Encoder = f.JSONEncoder()

+	o.Out = out

+

+	cmdNamespace, enforceNamespace, err := f.DefaultNamespace()

+	if err != nil {

+		return err

+	}

+

+	_, _, o.Clientset, err = f.Clients()

+	if err != nil {

+		return err

+	}

+

+	r := resource.NewBuilder(o.Mapper, o.Typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)).

+		NamespaceParam(cmdNamespace).DefaultNamespace().

+		FilenameParam(enforceNamespace, o.Recursive, o.Filenames...).

+		ResourceTypeOrNameArgs(true, args...).

+		ContinueOnError().

+		Latest().

+		Flatten().

+		Do()

+	err = r.Err()

+	if err != nil {

+		return err

+	}

+

+	o.Infos, err = r.Infos()

+	return err

+}

+

+func (o CancelOptions) Run() error {

+	allErrs := []error{}

+	for _, info := range o.Infos {

+		config, ok := info.Object.(*deployapi.DeploymentConfig)

+		if !ok {

+			allErrs = append(allErrs, kcmdutil.AddSourceToErr("cancelling", info.Source, fmt.Errorf("expected deployment configuration, got %T", info.Object)))

+		}

+		if config.Spec.Paused {

+			allErrs = append(allErrs, kcmdutil.AddSourceToErr("cancelling", info.Source, fmt.Errorf("unable to cancel paused deployment %s/%s", config.Namespace, config.Name)))

+		}

+

+		mapping, err := o.Mapper.RESTMapping(kapi.Kind("ReplicationController"))

+		if err != nil {

+			return err

+		}

+

+		mutateFn := func(rc *kapi.ReplicationController) bool {

+			if deployutil.IsDeploymentCancelled(rc) {

+				kcmdutil.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, "already cancelled")

+				return false

+			}

+

+			patches := set.CalculatePatches([]*resource.Info{{Object: rc, Mapping: mapping}}, o.Encoder, func(*resource.Info) (bool, error) {

+				rc.Annotations[deployapi.DeploymentCancelledAnnotation] = deployapi.DeploymentCancelledAnnotationValue

+				rc.Annotations[deployapi.DeploymentStatusReasonAnnotation] = deployapi.DeploymentCancelledByUser

+				return true, nil

+			})

+

+			if len(patches) == 0 {

+				kcmdutil.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, "already cancelled")

+				return false

+			}

+

+			_, err := o.Clientset.ReplicationControllers(rc.Namespace).Patch(rc.Name, kapi.StrategicMergePatchType, patches[0].Patch)

+			if err != nil {

+				allErrs = append(allErrs, kcmdutil.AddSourceToErr("cancelling", info.Source, err))

+				return false

+			}

+			kcmdutil.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, "cancelling")

+			return true

+		}

+

+		deployments, cancelled, err := o.forEachControllerInConfig(config.Namespace, config.Name, mutateFn)

+		if err != nil {

+			allErrs = append(allErrs, kcmdutil.AddSourceToErr("cancelling", info.Source, err))

+			continue

+		}

+

+		if !cancelled {

+			latest := &deployments[0]

+			maybeCancelling := ""

+			if deployutil.IsDeploymentCancelled(latest) && !deployutil.IsTerminatedDeployment(latest) {

+				maybeCancelling = " (cancelling)"

+			}

+			timeAt := strings.ToLower(units.HumanDuration(time.Now().Sub(latest.CreationTimestamp.Time)))

+			fmt.Fprintf(o.Out, "No rollout is in progress (latest rollout #%d %s%s %s ago)\n",

+				deployutil.DeploymentVersionFor(latest),

+				strings.ToLower(string(deployutil.DeploymentStatusFor(latest))),

+				maybeCancelling,

+				timeAt)

+		}

+

+	}

+	return utilerrors.NewAggregate(allErrs)

+}

+

+func (o CancelOptions) forEachControllerInConfig(namespace, name string, mutateFunc func(*kapi.ReplicationController) bool) ([]kapi.ReplicationController, bool, error) {

+	deployments, err := o.Clientset.ReplicationControllers(namespace).List(kapi.ListOptions{LabelSelector: deployutil.ConfigSelector(name)})

+	if err != nil {

+		return nil, false, err

+	}

+	if len(deployments.Items) == 0 {

+		return nil, false, fmt.Errorf("there have been no replication controllers for %s/%s\n", namespace, name)

+	}

+	sort.Sort(deployutil.ByLatestVersionDesc(deployments.Items))

+	allErrs := []error{}

+	cancelled := false

+

+	for _, deployment := range deployments.Items {

+		status := deployutil.DeploymentStatusFor(&deployment)

+		switch status {

+		case deployapi.DeploymentStatusNew,

+			deployapi.DeploymentStatusPending,

+			deployapi.DeploymentStatusRunning:

+			cancelled = mutateFunc(&deployment)

+		}

+	}

+

+	return deployments.Items, cancelled, utilerrors.NewAggregate(allErrs)

+}

@@ -48,6 +48,7 @@ func NewCmdRollout(fullName string, f *clientcmd.Factory, out, errOut io.Writer)

 	cmd.AddCommand(NewCmdRolloutUndo(fullName, f, out))

 	cmd.AddCommand(NewCmdRolloutLatest(fullName, f, out))

 	cmd.AddCommand(NewCmdRolloutStatus(fullName, f, out))

+	cmd.AddCommand(NewCmdRolloutCancel(fullName, f, out))

 	return cmd

 }

@@ -70,12 +70,12 @@ var _ = g.Describe("deploymentconfigs", func() {