Merge pull request openshift#278 from smarterclayton/version_check

clusteroperator: Report the appropriate injected status version

manifests/04-deployment.yaml

@@ -27,6 +27,9 @@ spec:
       containers:
       - image: quay.io/openshift/origin-cluster-monitoring-operator:latest
         name: cluster-monitoring-operator
+        env:
+        - name: RELEASE_VERSION
+          value: "0.0.1-snapshot"
         args:
         - "-namespace=openshift-monitoring"
         - "-configmap=cluster-monitoring-config"

manifests/05-clusteroperator.yaml

@@ -3,3 +3,7 @@ kind: ClusterOperator
 metadata:
   name: monitoring
 spec: {}
+status:
+  versions:
+  - name: operator
+    version: "0.0.1-snapshot"

pkg/client/clusteroperator.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"fmt"
+	"os"
 
 	v1 "github.com/openshift/api/config/v1"
 	clientv1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
@@ -40,7 +41,20 @@ func (r *StatusReporter) SetDone() error {
 	conditions.setCondition(v1.OperatorProgressing, v1.ConditionFalse, "", time)
 	conditions.setCondition(v1.OperatorFailing, v1.ConditionFalse, "", time)
 	co.Status.Conditions = conditions.entries()
-	//co.Status.Version = r.version
+
+	// If we have reached "level" for the operator, report that we are at the version
+	// injected into us during update. We require that all components be rolled out
+	// and available at the new version before reporting this value.
+	if releaseVersion := os.Getenv("RELEASE_VERSION"); len(releaseVersion) > 0 {
+		co.Status.Versions = []v1.OperandVersion{
+			{
+				Name:    "operator",
+				Version: releaseVersion,
+			},
+		}
+	} else {
+		co.Status.Versions = nil
+	}
 
 	_, err = r.client.UpdateStatus(co)
 	return err