@@ -11491,6 +11491,51 @@ _oc_rollout_history()

     noun_aliases+=("deployments")

 }

+_oc_rollout_latest()

+{

+    last_command="oc_rollout_latest"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    local_nonpersistent_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+    flags+=("--output=")

+    two_word_flags+=("-o")

+    local_nonpersistent_flags+=("--output=")

+    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+=("--server=")

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

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

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+    noun_aliases=()

+}

+

 _oc_rollout_pause()

 {

     last_command="oc_rollout_pause"

@@ -11663,6 +11708,7 @@ _oc_rollout()

     last_command="oc_rollout"

     commands=()

     commands+=("history")

+    commands+=("latest")

     commands+=("pause")

     commands+=("resume")

     commands+=("undo")

@@ -16052,6 +16052,52 @@ _openshift_cli_rollout_history()

     noun_aliases+=("deployments")

 }

+_openshift_cli_rollout_latest()

+{

+    last_command="openshift_cli_rollout_latest"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    local_nonpersistent_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+    flags+=("--output=")

+    two_word_flags+=("-o")

+    local_nonpersistent_flags+=("--output=")

+    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+=("--server=")

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

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

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+    noun_aliases=()

+}

+

 _openshift_cli_rollout_pause()

 {

     last_command="openshift_cli_rollout_pause"

@@ -16227,6 +16273,7 @@ _openshift_cli_rollout()

     last_command="openshift_cli_rollout"

     commands=()

     commands+=("history")

+    commands+=("latest")

     commands+=("pause")

     commands+=("resume")

     commands+=("undo")

@@ -11652,6 +11652,51 @@ _oc_rollout_history()

     noun_aliases+=("deployments")

 }

+_oc_rollout_latest()

+{

+    last_command="oc_rollout_latest"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    local_nonpersistent_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+    flags+=("--output=")

+    two_word_flags+=("-o")

+    local_nonpersistent_flags+=("--output=")

+    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+=("--server=")

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

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

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+    noun_aliases=()

+}

+

 _oc_rollout_pause()

 {

     last_command="oc_rollout_pause"

@@ -11824,6 +11869,7 @@ _oc_rollout()

     last_command="oc_rollout"

     commands=()

     commands+=("history")

+    commands+=("latest")

     commands+=("pause")

     commands+=("resume")

     commands+=("undo")

@@ -16213,6 +16213,52 @@ _openshift_cli_rollout_history()

     noun_aliases+=("deployments")

 }

+_openshift_cli_rollout_latest()

+{

+    last_command="openshift_cli_rollout_latest"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    local_nonpersistent_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+    flags+=("--output=")

+    two_word_flags+=("-o")

+    local_nonpersistent_flags+=("--output=")

+    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+=("--server=")

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

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

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+    noun_aliases=()

+}

+

 _openshift_cli_rollout_pause()

 {

     last_command="openshift_cli_rollout_pause"

@@ -16388,6 +16434,7 @@ _openshift_cli_rollout()

     last_command="openshift_cli_rollout"

     commands=()

     commands+=("history")

+    commands+=("latest")

     commands+=("pause")

     commands+=("resume")

     commands+=("undo")

@@ -2203,6 +2203,20 @@ View rollout history

 ====

+== oc rollout latest

+Start a new rollout for a deployment config with the latest state from its triggers

+

+====

+

+[options="nowrap"]

+----

+  # Start a new rollout based on the latest images defined in the image change triggers.

+  oc rollout latest dc/nginx

+

+----

+====

+

+

 == oc rollout pause

 Mark the provided resource as paused

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

 oc-replace.1

 oc-rollback.1

 oc-rollout-history.1

+oc-rollout-latest.1

 oc-rollout-pause.1

 oc-rollout-resume.1

 oc-rollout-undo.1

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

 openshift-cli-replace.1

 openshift-cli-rollback.1

 openshift-cli-rollout-history.1

+openshift-cli-rollout-latest.1

 openshift-cli-rollout-pause.1

 openshift-cli-rollout-resume.1

 openshift-cli-rollout-undo.1

new file mode 100644

@@ -0,0 +1,118 @@

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

+

+

+.SH NAME

+.PP

+oc rollout latest \- Start a new rollout for a deployment config with the latest state from its triggers

+

+

+.SH SYNOPSIS

+.PP

+\fBoc rollout latest\fP [OPTIONS]

+

+

+.SH DESCRIPTION

+.PP

+Start a new rollout for a deployment config with the latest state from its triggers

+

+.PP

+This command is appropriate for running manual rollouts. If you want full control over

+running new rollouts, use "oc set triggers \-\-manual" to disable all triggers in your

+deployment config and then whenever you want to run a new deployment process, use this

+command in order to pick up the latest images found in the cluster that are pointed by

+your image change triggers.

+

+

+.SH OPTIONS

+.PP

+\fB\-o\fP, \fB\-\-output\fP=""

+    Output mode. Use "\-o name" for shorter output (resource/name).

+

+

+.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\-\-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

+  # Start a new rollout based on the latest images defined in the image change triggers.

+  oc rollout latest dc/nginx

+

+

+.fi

+.RE

+

+

+.SH SEE ALSO

+.PP

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

+

+

+.SH HISTORY

+.PP

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

@@ -13,8 +13,28 @@ oc rollout \- rollout manages a deployment

 .SH DESCRIPTION

 .PP

-Manage deployments.

+Start a new rollout, view its status or history, rollback to a previous revision of your app

+.PP

+This command allows you to control a deployment config. Each individual rollout is exposed

+as a replication controller, and the deployment process manages scaling down old replication

+controllers and scaling up new ones.

+

+.PP

+There are several deployment strategies defined:

+.IP 

+

+.IP

+\(bu Rolling (default) \- scales up the new replication controller in stages, gradually reducing the

+number of old pods. If one of the new deployed pods never becomes "ready", the new rollout

+will be rolled back (scaled down to zero). Use when your application can tolerate two versions

+of code running at the same time (many web applications, scalable databases)

+.IP

+\(bu Recreate \- scales the old replication controller down to zero, then scales the new replication

+controller up to full. Use when your application cannot tolerate two versions of code running

+at the same time

+.IP

+\(bu Custom \- run your own deployment process inside a Docker container using your own scripts.

 .SH OPTIONS INHERITED FROM PARENT COMMANDS

 .PP

@@ -84,7 +104,7 @@ Manage deployments.

 .SH SEE ALSO

 .PP

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

+\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\-undo(1)\fP,

 .SH HISTORY

new file mode 100644

@@ -0,0 +1,118 @@

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

+

+

+.SH NAME

+.PP

+openshift cli rollout latest \- Start a new rollout for a deployment config with the latest state from its triggers

+

+

+.SH SYNOPSIS

+.PP

+\fBopenshift cli rollout latest\fP [OPTIONS]

+

+

+.SH DESCRIPTION

+.PP

+Start a new rollout for a deployment config with the latest state from its triggers

+

+.PP

+This command is appropriate for running manual rollouts. If you want full control over

+running new rollouts, use "oc set triggers \-\-manual" to disable all triggers in your

+deployment config and then whenever you want to run a new deployment process, use this

+command in order to pick up the latest images found in the cluster that are pointed by

+your image change triggers.

+

+

+.SH OPTIONS

+.PP

+\fB\-o\fP, \fB\-\-output\fP=""

+    Output mode. Use "\-o name" for shorter output (resource/name).

+

+

+.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\-\-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

+  # Start a new rollout based on the latest images defined in the image change triggers.

+  openshift cli rollout latest 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

@@ -13,8 +13,28 @@ openshift cli rollout \- rollout manages a deployment

 .SH DESCRIPTION

 .PP

-Manage deployments.

+Start a new rollout, view its status or history, rollback to a previous revision of your app

+.PP

+This command allows you to control a deployment config. Each individual rollout is exposed

+as a replication controller, and the deployment process manages scaling down old replication

+controllers and scaling up new ones.

+

+.PP

+There are several deployment strategies defined:

+.IP 

+

+.IP

+\(bu Rolling (default) \- scales up the new replication controller in stages, gradually reducing the

+number of old pods. If one of the new deployed pods never becomes "ready", the new rollout

+will be rolled back (scaled down to zero). Use when your application can tolerate two versions

+of code running at the same time (many web applications, scalable databases)

+.IP

+\(bu Recreate \- scales the old replication controller down to zero, then scales the new replication

+controller up to full. Use when your application cannot tolerate two versions of code running

+at the same time

+.IP

+\(bu Custom \- run your own deployment process inside a Docker container using your own scripts.

 .SH OPTIONS INHERITED FROM PARENT COMMANDS

 .PP

@@ -84,7 +104,7 @@ Manage deployments.

 .SH SEE ALSO

 .PP

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

+\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\-undo(1)\fP,

 .SH HISTORY

new file mode 100644

@@ -0,0 +1,167 @@

+package rollout

+

+import (

+	"errors"

+	"fmt"

+	"io"

+

+	"github.com/spf13/cobra"

+	kerrors "k8s.io/kubernetes/pkg/api/errors"

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

+	kclient "k8s.io/kubernetes/pkg/client/unversioned"

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

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

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

+

+	"github.com/openshift/origin/pkg/client"

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

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

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

+)

+

+const (

+	rolloutLatestLong = `

+Start a new rollout for a deployment config with the latest state from its triggers

+

+This command is appropriate for running manual rollouts. If you want full control over

+running new rollouts, use "oc set triggers --manual" to disable all triggers in your

+deployment config and then whenever you want to run a new deployment process, use this

+command in order to pick up the latest images found in the cluster that are pointed by

+your image change triggers.`

+

+	rolloutLatestExample = `  # Start a new rollout based on the latest images defined in the image change triggers.

+  %[1]s rollout latest dc/nginx

+`

+)

+

+// RolloutLatestOptions holds all the options for the `rollout latest` command.

+// TODO: Support --dry-run

+type RolloutLatestOptions struct {

+	mapper meta.RESTMapper

+	typer  runtime.ObjectTyper

+	infos  []*resource.Info

+

+	out         io.Writer

+	shortOutput bool

+

+	oc              client.Interface

+	kc              kclient.Interface

+	baseCommandName string

+}

+

+// NewCmdRolloutLatest implements the oc rollout latest subcommand.

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

+	opts := &RolloutLatestOptions{

+		baseCommandName: fullName,

+	}

+

+	cmd := &cobra.Command{

+		Use:     "latest DEPLOYMENTCONFIG",

+		Short:   "Start a new rollout for a deployment config with the latest state from its triggers",

+		Long:    rolloutLatestLong,

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

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

+			err := opts.Complete(f, cmd, args, out)

+			kcmdutil.CheckErr(err)

+

+			if err := opts.Validate(); err != nil {

+				kcmdutil.CheckErr(kcmdutil.UsageError(cmd, err.Error()))

+			}

+

+			err = opts.RunRolloutLatest()

+			kcmdutil.CheckErr(err)

+		},

+	}

+

+	kcmdutil.AddOutputFlagsForMutation(cmd)

+

+	return cmd

+}

+

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

+	if len(args) != 1 {

+		return errors.New("one deployment config name is needed as argument.")

+	}

+

+	namespace, _, err := f.DefaultNamespace()

+	if err != nil {

+		return err

+	}

+

+	o.oc, o.kc, err = f.Clients()

+	if err != nil {

+		return err

+	}

+

+	o.mapper, o.typer = f.Object(false)

+	o.infos, err = resource.NewBuilder(o.mapper, o.typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)).

+		ContinueOnError().

+		NamespaceParam(namespace).

+		ResourceNames("deploymentconfigs", args[0]).

+		SingleResourceType().

+		Do().Infos()

+	if err != nil {

+		return err

+	}

+

+	o.out = out

+	o.shortOutput = kcmdutil.GetFlagString(cmd, "output") == "name"

+

+	return nil

+}

+

+func (o RolloutLatestOptions) Validate() error {

+	if len(o.infos) != 1 {

+		return errors.New("a deployment config name is required.")

+	}

+	return nil

+}

+

+func (o RolloutLatestOptions) RunRolloutLatest() error {

+	info := o.infos[0]

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

+	if !ok {

+		return fmt.Errorf("%s is not a deployment config", info.Name)

+	}

+

+	// TODO: Consider allowing one-off deployments for paused configs

+	// See https://github.com/openshift/origin/issues/9903

+	if config.Spec.Paused {

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

+	}

+

+	deploymentName := deployutil.LatestDeploymentNameForConfig(config)

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

+	switch {

+	case err == nil:

+		// Reject attempts to start a concurrent deployment.

+		if !deployutil.IsTerminatedDeployment(deployment) {

+			status := deployutil.DeploymentStatusFor(deployment)

+			return fmt.Errorf("#%d is already in progress (%s).", config.Status.LatestVersion, status)

+		}

+	case !kerrors.IsNotFound(err):

+		return err

+	}

+

+	request := &deployapi.DeploymentRequest{

+		Name:   config.Name,

+		Latest: true,

+		Force:  true,

+	}

+

+	dc, err := o.oc.DeploymentConfigs(config.Namespace).Instantiate(request)

+	// Pre 1.4 servers don't support the instantiate endpoint. Fallback to incrementing

+	// latestVersion on them.

+	if kerrors.IsNotFound(err) || kerrors.IsForbidden(err) {

+		config.Status.LatestVersion++

+		dc, err = o.oc.DeploymentConfigs(config.Namespace).Update(config)

+	}

+	if err != nil {

+		return err

+	}

+

+	info.Refresh(dc, true)

+

+	kcmdutil.PrintSuccess(o.mapper, o.shortOutput, o.out, info.Mapping.Resource, info.Name, "rolled out")

+	return nil

+}

@@ -12,7 +12,22 @@ import (

 const (

 	rolloutLong = `

-Manage deployments.

+Start a new rollout, view its status or history, rollback to a previous revision of your app

+

+This command allows you to control a deployment config. Each individual rollout is exposed

+as a replication controller, and the deployment process manages scaling down old replication

+controllers and scaling up new ones.

+

+There are several deployment strategies defined:

+

+* Rolling (default) - scales up the new replication controller in stages, gradually reducing the

+  number of old pods. If one of the new deployed pods never becomes "ready", the new rollout

+  will be rolled back (scaled down to zero). Use when your application can tolerate two versions

+  of code running at the same time (many web applications, scalable databases)

+* Recreate - scales the old replication controller down to zero, then scales the new replication

+  controller up to full. Use when your application cannot tolerate two versions of code running

+  at the same time

+* Custom - run your own deployment process inside a Docker container using your own scripts.

 `

 )

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

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

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

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

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

 	return cmd

 }

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

 			o.Expect(err).NotTo(o.HaveOccurred())

 			g.By("deploying a second time [new client]")

-			_, err = oc.Run("deploy").Args("--latest", name).Output()

+			_, err = oc.Run("rollout").Args("latest", name).Output()

 			o.Expect(err).NotTo(o.HaveOccurred())

 			g.By("verifying that both latestVersion and generation are updated")

@@ -600,16 +600,25 @@ var _ = g.Describe("deploymentconfigs", func() {

 			o.Expect(waitForLatestCondition(oc, name, deploymentRunTimeout, deploymentReachedCompletion)).NotTo(o.HaveOccurred())

-			_, err = oc.Run("deploy").Args(name, "--latest").Output()

+			_, err = oc.Run("rollout").Args("latest", name).Output()

 			o.Expect(err).NotTo(o.HaveOccurred())

-			o.Expect(waitForLatestCondition(oc, name, deploymentRunTimeout, deploymentReachedCompletion)).NotTo(o.HaveOccurred())

-

 			g.By("verifying that we are on the second version")

-			version, err := oc.Run("get").Args(resource, "--output=jsonpath=\"{.status.latestVersion}\"").Output()

+			version := "1"

+			err = wait.PollImmediate(500*time.Millisecond, 30*time.Second, func() (bool, error) {

+				latestVersion, err := oc.Run("get").Args(resource, "--output=jsonpath=\"{.status.latestVersion}\"").Output()

+				if err != nil {

+					return false, err

+				}

+				version = strings.Trim(latestVersion, "\"")

+				return strings.Contains(version, "2"), nil

+			})

+			if err == wait.ErrWaitTimeout {

+				err = fmt.Errorf("expected latestVersion: 2, got: %s", version)

+			}

 			o.Expect(err).NotTo(o.HaveOccurred())

-			version = strings.Trim(version, "\"")

-			o.Expect(version).To(o.ContainSubstring("2"))

+

+			o.Expect(waitForLatestCondition(oc, name, deploymentRunTimeout, deploymentReachedCompletion)).NotTo(o.HaveOccurred())

 			g.By("verifying that we can rollback")

 			_, err = oc.Run("rollout").Args("undo", resource).Output()