React to new --revision flag in rollout status

Author: 0xmichalis

contrib/completions/bash/oc

@@ -11674,6 +11674,8 @@ _oc_rollout_status()
     flags+=("--recursive")
     flags+=("-R")
     local_nonpersistent_flags+=("--recursive")
+    flags+=("--revision=")
+    local_nonpersistent_flags+=("--revision=")
     flags+=("--as=")
     flags+=("--certificate-authority=")
     flags_with_completion+=("--certificate-authority")

contrib/completions/bash/openshift

@@ -16238,6 +16238,8 @@ _openshift_cli_rollout_status()
     flags+=("--recursive")
     flags+=("-R")
     local_nonpersistent_flags+=("--recursive")
+    flags+=("--revision=")
+    local_nonpersistent_flags+=("--revision=")
     flags+=("--as=")
     flags+=("--certificate-authority=")
     flags_with_completion+=("--certificate-authority")
@@ -26529,6 +26531,8 @@ _openshift_kube_rollout_status()
     flags+=("--recursive")
     flags+=("-R")
     local_nonpersistent_flags+=("--recursive")
+    flags+=("--revision=")
+    local_nonpersistent_flags+=("--revision=")
     flags+=("--allow-verification-with-non-compliant-keys")
     flags+=("--alsologtostderr")
     flags+=("--application-metrics-count-limit=")

contrib/completions/zsh/oc

@@ -11835,6 +11835,8 @@ _oc_rollout_status()
     flags+=("--recursive")
     flags+=("-R")
     local_nonpersistent_flags+=("--recursive")
+    flags+=("--revision=")
+    local_nonpersistent_flags+=("--revision=")
     flags+=("--as=")
     flags+=("--certificate-authority=")
     flags_with_completion+=("--certificate-authority")

contrib/completions/zsh/openshift

@@ -16399,6 +16399,8 @@ _openshift_cli_rollout_status()
     flags+=("--recursive")
     flags+=("-R")
     local_nonpersistent_flags+=("--recursive")
+    flags+=("--revision=")
+    local_nonpersistent_flags+=("--revision=")
     flags+=("--as=")
     flags+=("--certificate-authority=")
     flags_with_completion+=("--certificate-authority")
@@ -26690,6 +26692,8 @@ _openshift_kube_rollout_status()
     flags+=("--recursive")
     flags+=("-R")
     local_nonpersistent_flags+=("--recursive")
+    flags+=("--revision=")
+    local_nonpersistent_flags+=("--revision=")
     flags+=("--allow-verification-with-non-compliant-keys")
     flags+=("--alsologtostderr")
     flags+=("--application-metrics-count-limit=")

docs/man/man1/oc-rollout-status.1

@@ -25,6 +25,10 @@ Watch the status of the latest rollout, until it's done.
 \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.
 
+.PP
+\fB\-\-revision\fP=0
+    Pin to a specific revision for showing its status. Defaults to 0 (last revision).
+
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP

docs/man/man1/openshift-cli-rollout-status.1

@@ -25,6 +25,10 @@ Watch the status of the latest rollout, until it's done.
 \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.
 
+.PP
+\fB\-\-revision\fP=0
+    Pin to a specific revision for showing its status. Defaults to 0 (last revision).
+
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP

docs/man/man1/openshift-kube-rollout-status.1

@@ -25,6 +25,10 @@ Watch the status of current rollout, until it's done.
 \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.
 
+.PP
+\fB\-\-revision\fP=0
+    Pin to a specific revision for showing its status. Defaults to 0 (last revision).
+
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP

pkg/deploy/cmd/status.go

@@ -24,13 +24,14 @@ type DeploymentConfigStatusViewer struct {
 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) {
+func (s *DeploymentConfigStatusViewer) Status(namespace, name string, desiredRevision int64) (string, bool, error) {
 	config, err := s.dn.DeploymentConfigs(namespace).Get(name)
 	if err != nil {
 		return "", false, err
 	}
+	latestRevision := config.Status.LatestVersion
 
-	if config.Status.LatestVersion == 0 {
+	if latestRevision == 0 {
 		switch {
 		case deployutil.HasImageChangeTrigger(config):
 			return fmt.Sprintf("Deployment config %q waiting on image update\n", name), false, nil
@@ -40,6 +41,10 @@ func (s *DeploymentConfigStatusViewer) Status(namespace, name string) (string, b
 		}
 	}
 
+	if desiredRevision > 0 && latestRevision != desiredRevision {
+		return "", false, fmt.Errorf("desired revision (%d) is different from the running revision (%d)", desiredRevision, latestRevision)
+	}
+
 	cond := deployutil.GetDeploymentCondition(config.Status, deployapi.DeploymentProgressing)
 
 	if config.Generation <= config.Status.ObservedGeneration {