@@ -11653,6 +11653,61 @@ _oc_rollout_resume()

     noun_aliases+=("deployments")

 }

+_oc_rollout_status()

+{

+    last_command="oc_rollout_status"

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

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

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

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+    must_have_one_noun+=("deployment")

+    noun_aliases=()

+    noun_aliases+=("deploy")

+    noun_aliases+=("deployments")

+}

+

 _oc_rollout_undo()

 {

     last_command="oc_rollout_undo"

@@ -11719,6 +11774,7 @@ _oc_rollout()

     commands+=("latest")

     commands+=("pause")

     commands+=("resume")

+    commands+=("status")

     commands+=("undo")

     flags=()

@@ -16217,6 +16217,62 @@ _openshift_cli_rollout_resume()

     noun_aliases+=("deployments")

 }

+_openshift_cli_rollout_status()

+{

+    last_command="openshift_cli_rollout_status"

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

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

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

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+    must_have_one_noun+=("deployment")

+    noun_aliases=()

+    noun_aliases+=("deploy")

+    noun_aliases+=("deployments")

+}

+

 _openshift_cli_rollout_undo()

 {

     last_command="openshift_cli_rollout_undo"

@@ -16284,6 +16340,7 @@ _openshift_cli_rollout()

     commands+=("latest")

     commands+=("pause")

     commands+=("resume")

+    commands+=("status")

     commands+=("undo")

     flags=()

@@ -11814,6 +11814,61 @@ _oc_rollout_resume()

     noun_aliases+=("deployments")

 }

+_oc_rollout_status()

+{

+    last_command="oc_rollout_status"

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

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

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

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+    must_have_one_noun+=("deployment")

+    noun_aliases=()

+    noun_aliases+=("deploy")

+    noun_aliases+=("deployments")

+}

+

 _oc_rollout_undo()

 {

     last_command="oc_rollout_undo"

@@ -11880,6 +11935,7 @@ _oc_rollout()

     commands+=("latest")

     commands+=("pause")

     commands+=("resume")

+    commands+=("status")

     commands+=("undo")

     flags=()

@@ -16378,6 +16378,62 @@ _openshift_cli_rollout_resume()

     noun_aliases+=("deployments")

 }

+_openshift_cli_rollout_status()

+{

+    last_command="openshift_cli_rollout_status"

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

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

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

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+    must_have_one_noun+=("deployment")

+    noun_aliases=()

+    noun_aliases+=("deploy")

+    noun_aliases+=("deployments")

+}

+

 _openshift_cli_rollout_undo()

 {

     last_command="openshift_cli_rollout_undo"

@@ -16445,6 +16501,7 @@ _openshift_cli_rollout()

     commands+=("latest")

     commands+=("pause")

     commands+=("resume")

+    commands+=("status")

     commands+=("undo")

     flags=()

@@ -2245,6 +2245,20 @@ Resume a paused resource

 ====

+== oc rollout status

+Watch rollout status until it's done

+

+====

+

+[options="nowrap"]

+----

+  # Watch the status of the latest rollout

+  oc rollout status dc/nginx

+

+----

+====

+

+

 == oc rollout undo

 Undo a previous rollout

@@ -185,6 +185,7 @@ oc-rollout-history.1

 oc-rollout-latest.1

 oc-rollout-pause.1

 oc-rollout-resume.1

+oc-rollout-status.1

 oc-rollout-undo.1

 oc-rollout.1

 oc-rsh.1

@@ -274,6 +274,7 @@ openshift-cli-rollout-history.1

 openshift-cli-rollout-latest.1

 openshift-cli-rollout-pause.1

 openshift-cli-rollout-resume.1

+openshift-cli-rollout-status.1

 openshift-cli-rollout-undo.1

 openshift-cli-rollout.1

 openshift-cli-rsh.1

new file mode 100644

@@ -0,0 +1,115 @@

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

+

+

+.SH NAME

+.PP

+oc rollout status \- Watch rollout status until it's done

+

+

+.SH SYNOPSIS

+.PP

+\fBoc rollout status\fP [OPTIONS]

+

+

+.SH DESCRIPTION

+.PP

+Watch the status of the latest rollout, until it's done.

+

+

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

+  # Watch the status of the latest rollout

+  oc rollout status dc/nginx

+

+

+.fi

+.RE

+

+

+.SH SEE ALSO

+.PP

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

+

+

+.SH HISTORY

+.PP

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

@@ -104,7 +104,7 @@ at the same time

 .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\-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\-status(1)\fP, \fBoc\-rollout\-undo(1)\fP,

 .SH HISTORY

new file mode 100644

@@ -0,0 +1,115 @@

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

+

+

+.SH NAME

+.PP

+openshift cli rollout status \- Watch rollout status until it's done

+

+

+.SH SYNOPSIS

+.PP

+\fBopenshift cli rollout status\fP [OPTIONS]

+

+

+.SH DESCRIPTION

+.PP

+Watch the status of the latest rollout, until it's done.

+

+

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

+  # Watch the status of the latest rollout

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

@@ -104,7 +104,7 @@ at the same time

 .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\-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\-status(1)\fP, \fBopenshift\-cli\-rollout\-undo(1)\fP,

 .SH HISTORY

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

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

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

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

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

 	return cmd

 }

@@ -154,3 +155,20 @@ func NewCmdRolloutUndo(fullName string, f *clientcmd.Factory, out io.Writer) *co

 	cmd.ValidArgs = append(cmd.ValidArgs, "deploymentconfig")

 	return cmd

 }

+

+const (

+	rolloutStatusLong = `

+Watch the status of the latest rollout, until it's done.`

+

+	rolloutStatusExample = `  # Watch the status of the latest rollout

+  %[1]s rollout status dc/nginx

+`

+)

+

+// NewCmdRolloutStatus is a wrapper for the Kubernetes cli rollout status command

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

+	cmd := rollout.NewCmdRolloutStatus(f.Factory, out)

+	cmd.Long = rolloutStatusLong

+	cmd.Example = fmt.Sprintf(rolloutStatusExample, fullName)

+	return cmd

+}

@@ -637,6 +637,19 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {

 		}

 		return kRollbackerFunc(mapping)

 	}

+	kStatusViewerFunc := w.Factory.StatusViewer

+	w.Factory.StatusViewer = func(mapping *meta.RESTMapping) (kubectl.StatusViewer, error) {

+		oc, _, err := w.Clients()

+		if err != nil {

+			return nil, err

+		}

+

+		switch mapping.GroupVersionKind.GroupKind() {

+		case deployapi.Kind("DeploymentConfig"):

+			return deploycmd.NewDeploymentConfigStatusViewer(oc), nil

+		}

+		return kStatusViewerFunc(mapping)

+	}

 	return w

 }

new file mode 100644

@@ -0,0 +1,67 @@

+package cmd

+

+import (

+	"errors"

+	"fmt"

+

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

+

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

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

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

+)

+

+func NewDeploymentConfigStatusViewer(oc client.Interface) kubectl.StatusViewer {

+	return &DeploymentConfigStatusViewer{dn: oc}

+}

+

+// DeploymentConfigStatusViewer is an implementation of the kubectl StatusViewer interface

+// for deployment configs.

+type DeploymentConfigStatusViewer struct {

+	dn client.DeploymentConfigsNamespacer

+}

+

+var _ kubectl.StatusViewer = &DeploymentConfigStatusViewer{}

+

+// Status returns a message describing deployment status, and a bool value indicating if the status is considered done

+func (s *DeploymentConfigStatusViewer) Status(namespace, name string) (string, bool, error) {

+	config, err := s.dn.DeploymentConfigs(namespace).Get(name)

+	if err != nil {

+		return "", false, err

+	}

+

+	if config.Status.LatestVersion == 0 {

+		switch {

+		case deployutil.HasImageChangeTrigger(config):

+			return fmt.Sprintf("Deployment config %q waiting on image update\n", name), false, nil

+

+		case len(config.Spec.Triggers) == 0:

+			return "", true, fmt.Errorf("Deployment config %q waiting on manual update (use 'oc rollout latest %s')", name, name)

+		}

+	}

+

+	cond := deployutil.GetDeploymentCondition(config.Status, deployapi.DeploymentProgressing)

+

+	if config.Generation <= config.Status.ObservedGeneration {

+		switch {

+		case cond != nil && cond.Reason == deployutil.NewRcAvailableReason:

+			return fmt.Sprintf("%s\n", cond.Message), true, nil

+

+		case cond != nil && cond.Reason == deployutil.TimedOutReason:

+			return "", true, errors.New(cond.Message)

+

+		case cond != nil && cond.Reason == deployutil.PausedDeployReason:

+			return "", true, fmt.Errorf("Deployment config %q is paused. Resume to continue watching the status of the rollout.\n", config.Name)

+

+		case config.Status.UpdatedReplicas < config.Spec.Replicas:

+			return fmt.Sprintf("Waiting for rollout to finish: %d out of %d new replicas have been updated...\n", config.Status.UpdatedReplicas, config.Spec.Replicas), false, nil

+

+		case config.Status.Replicas > config.Status.UpdatedReplicas:

+			return fmt.Sprintf("Waiting for rollout to finish: %d old replicas are pending termination...\n", config.Status.Replicas-config.Status.UpdatedReplicas), false, nil

+

+		case config.Status.AvailableReplicas < config.Status.UpdatedReplicas:

+			return fmt.Sprintf("Waiting for rollout to finish: %d of %d updated replicas are available...\n", config.Status.AvailableReplicas, config.Status.UpdatedReplicas), false, nil

+		}

+	}

+	return fmt.Sprintf("Waiting for latest deployment config spec to be observed by the controller loop...\n"), false, nil

+}

@@ -359,6 +359,12 @@ func (c *DeploymentConfigController) updateStatus(config *deployapi.DeploymentCo

 		return err

 	}

+	latestExists, latestRC := deployutil.LatestDeploymentInfo(config, deployments)

+	if !latestExists {

+		latestRC = nil

+	}

+	updateConditions(config, &newStatus, latestRC)

+

 	// NOTE: We should update the status of the deployment config only if we need to, otherwise

 	// we hotloop between updates.

 	if reflect.DeepEqual(newStatus, config.Status) {

@@ -411,6 +417,58 @@ func (c *DeploymentConfigController) calculateStatus(config deployapi.Deployment

 	}, nil

 }

+func updateConditions(config *deployapi.DeploymentConfig, newStatus *deployapi.DeploymentConfigStatus, latestRC *kapi.ReplicationController) {

+	// Availability condition.

+	if newStatus.AvailableReplicas >= config.Spec.Replicas-deployutil.MaxUnavailable(*config) {

+		minAvailability := deployutil.NewDeploymentCondition(deployapi.DeploymentAvailable, kapi.ConditionTrue, "", "Deployment config has minimum availability.")

+		deployutil.SetDeploymentCondition(newStatus, *minAvailability)

+	} else {

+		noMinAvailability := deployutil.NewDeploymentCondition(deployapi.DeploymentAvailable, kapi.ConditionFalse, "", "Deployment config does not have minimum availability.")

+		deployutil.SetDeploymentCondition(newStatus, *noMinAvailability)

+	}

+	// Condition about progress.

+	cond := deployutil.GetDeploymentCondition(*newStatus, deployapi.DeploymentProgressing)

+	if latestRC != nil {

+		switch deployutil.DeploymentStatusFor(latestRC) {

+		case deployapi.DeploymentStatusNew, deployapi.DeploymentStatusPending:

+			msg := fmt.Sprintf("Waiting on deployer pod for %q to be scheduled", latestRC.Name)

+			condition := deployutil.NewDeploymentCondition(deployapi.DeploymentProgressing, kapi.ConditionUnknown, "", msg)

+			deployutil.SetDeploymentCondition(newStatus, *condition)

+		case deployapi.DeploymentStatusRunning:

+			msg := fmt.Sprintf("Replication controller %q is progressing", latestRC.Name)

+			condition := deployutil.NewDeploymentCondition(deployapi.DeploymentProgressing, kapi.ConditionTrue, deployutil.ReplicationControllerUpdatedReason, msg)

+			deployutil.SetDeploymentCondition(newStatus, *condition)

+		case deployapi.DeploymentStatusFailed:

+			if cond != nil && cond.Reason == deployutil.TimedOutReason {

+				break

+			}

+			msg := fmt.Sprintf("Replication controller %q has failed progressing", latestRC.Name)

+			condition := deployutil.NewDeploymentCondition(deployapi.DeploymentProgressing, kapi.ConditionFalse, deployutil.TimedOutReason, msg)

+			deployutil.SetDeploymentCondition(newStatus, *condition)

+		case deployapi.DeploymentStatusComplete:

+			if cond != nil && cond.Reason == deployutil.NewRcAvailableReason {

+				break

+			}

+			msg := fmt.Sprintf("Replication controller %q has completed progressing", latestRC.Name)

+			condition := deployutil.NewDeploymentCondition(deployapi.DeploymentProgressing, kapi.ConditionTrue, deployutil.NewRcAvailableReason, msg)

+			deployutil.SetDeploymentCondition(newStatus, *condition)

+		}

+	}

+	// Pause / resume condition. Since we don't pause running deployments, let's use paused conditions only when a deployment

+	// actually terminates. For now it may be ok to override lack of progress in the conditions, later we may want to separate

+	// paused from the rest of the progressing conditions.

+	if latestRC == nil || deployutil.IsTerminatedDeployment(latestRC) {

+		pausedCondExists := cond != nil && cond.Reason == deployutil.PausedDeployReason

+		if config.Spec.Paused && !pausedCondExists {

+			condition := deployutil.NewDeploymentCondition(deployapi.DeploymentProgressing, kapi.ConditionUnknown, deployutil.PausedDeployReason, "Deployment config is paused")

+			deployutil.SetDeploymentCondition(newStatus, *condition)

+		} else if !config.Spec.Paused && pausedCondExists {

+			condition := deployutil.NewDeploymentCondition(deployapi.DeploymentProgressing, kapi.ConditionUnknown, deployutil.ResumedDeployReason, "Deployment config is resumed")

+			deployutil.SetDeploymentCondition(newStatus, *condition)

+		}

+	}

+}

+

 func (c *DeploymentConfigController) handleErr(err error, key interface{}) {

 	if err == nil {

 		c.queue.Forget(key)

@@ -9,6 +9,7 @@ import (

 	"time"

 	"k8s.io/kubernetes/pkg/api"

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

 	kdeplutil "k8s.io/kubernetes/pkg/controller/deployment/util"

 	"k8s.io/kubernetes/pkg/fields"

 	"k8s.io/kubernetes/pkg/labels"

@@ -20,6 +21,78 @@ import (

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

 )

+const (

+	// Reasons for deployment config conditions:

+	//

+	// ReplicationControllerUpdatedReason is added in a deployment config when one of its replication

+	// controllers is updated as part of the rollout process.

+	ReplicationControllerUpdatedReason = "ReplicationControllerUpdated"

+	// FailedRcCreateReason is added in a deployment config when it cannot create a new replication

+	// controller.

+	FailedRcCreateReason = "ReplicationControllerCreateError"

+	// NewReplicationControllerReason is added in a deployment config when it creates a new replication

+	// controller.

+	NewReplicationControllerReason = "NewReplicationControllerCreated"

+	// NewRcAvailableReason is added in a deployment config when its newest replication controller is made

+	// available ie. the number of new pods that have passed readiness checks and run for at least

+	// minReadySeconds is at least the minimum available pods that need to run for the deployment config.

+	NewRcAvailableReason = "NewReplicationControllerAvailable"

+	// TimedOutReason is added in a deployment config when its newest replication controller fails to show

+	// any progress within the given deadline (progressDeadlineSeconds).

+	TimedOutReason = "ProgressDeadlineExceeded"

+	// PausedDeployReason is added in a deployment config when it is paused. Lack of progress shouldn't be

+	// estimated once a deployment config is paused.

+	PausedDeployReason = "DeploymentConfigPaused"

+	// ResumedDeployReason is added in a deployment config when it is resumed. Useful for not failing accidentally

+	// deployment configs that paused amidst a rollout.

+	ResumedDeployReason = "DeploymentConfigResumed"

+)

+

+// NewDeploymentCondition creates a new deployment condition.

+func NewDeploymentCondition(condType deployapi.DeploymentConditionType, status api.ConditionStatus, reason, message string) *deployapi.DeploymentCondition {

+	return &deployapi.DeploymentCondition{

+		Type:               condType,

+		Status:             status,

+		LastTransitionTime: unversioned.Now(),

+		Reason:             reason,

+		Message:            message,

+	}

+}

+

+// GetDeploymentCondition returns the condition with the provided type.

+func GetDeploymentCondition(status deployapi.DeploymentConfigStatus, condType deployapi.DeploymentConditionType) *deployapi.DeploymentCondition {

+	for i := range status.Conditions {

+		c := status.Conditions[i]

+		if c.Type == condType {

+			return &c

+		}

+	}

+	return nil

+}

+

+// SetDeploymentCondition updates the deployment to include the provided condition.

+func SetDeploymentCondition(status *deployapi.DeploymentConfigStatus, condition deployapi.DeploymentCondition) {

+	newConditions := filterOutCondition(status.Conditions, condition.Type)

+	status.Conditions = append(newConditions, condition)

+}

+

+// RemoveDeploymentCondition removes the deployment condition with the provided type.

+func RemoveDeploymentCondition(status *deployapi.DeploymentConfigStatus, condType deployapi.DeploymentConditionType) {

+	status.Conditions = filterOutCondition(status.Conditions, condType)

+}

+

+// filterOutCondition returns a new slice of deployment conditions without conditions with the provided type.

+func filterOutCondition(conditions []deployapi.DeploymentCondition, condType deployapi.DeploymentConditionType) []deployapi.DeploymentCondition {

+	var newConditions []deployapi.DeploymentCondition

+	for _, c := range conditions {

+		if c.Type == condType {

+			continue

+		}

+		newConditions = append(newConditions, c)

+	}

+	return newConditions

+}

+

 // LatestDeploymentNameForConfig returns a stable identifier for config based on its version.

 func LatestDeploymentNameForConfig(config *deployapi.DeploymentConfig) string {

 	return fmt.Sprintf("%s-%d", config.Name, config.Status.LatestVersion)

@@ -112,6 +185,17 @@ func HasChangeTrigger(config *deployapi.DeploymentConfig) bool {

 	return false

 }

+// HasImageChangeTrigger returns whether the provided deployment configuration has

+// an image change trigger or not.

+func HasImageChangeTrigger(config *deployapi.DeploymentConfig) bool {

+	for _, trigger := range config.Spec.Triggers {

+		if trigger.Type == deployapi.DeploymentTriggerOnImageChange {

+			return true

+		}

+	}

+	return false