Merge pull request #217 from mgugino-upstream-stage/no-version-progress-sync

MAO: Stop setting statusProgressing=true when resyincing same version

Author: openshift-merge-robot

Gopkg.lock

@@ -38,18 +38,20 @@ func (optr *Operator) statusProgressing() error {
 		glog.Errorf("error getting current versions: %v", err)
 		return err
 	}
-
+	var isProgressing osconfigv1.ConditionStatus
 	var message string
 	if !reflect.DeepEqual(desiredVersions, currentVersions) {
 		message = fmt.Sprintf("Progressing towards %s", optr.printOperandVersions())
+		isProgressing = osconfigv1.ConditionTrue
 	} else {
 		message = fmt.Sprintf("Running resync for %s", optr.printOperandVersions())
+		isProgressing = osconfigv1.ConditionFalse
 	}
 
 	conds := []osconfigv1.ClusterOperatorStatusCondition{
 		{
 			Type:    osconfigv1.OperatorProgressing,
-			Status:  osconfigv1.ConditionTrue,
+			Status:  isProgressing,
 			Reason:  string(ReasonSyncing),
 			Message: message,
 		},

pkg/operator/status.go

@@ -1,9 +1,11 @@
 package operator
 
 import (
-	"testing"
-
 	osconfigv1 "github.com/openshift/api/config/v1"
+	fakeconfigclientset "github.com/openshift/client-go/config/clientset/versioned/fake"
+	"github.com/stretchr/testify/assert"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"testing"
 )
 
 func TestPrintOperandVersions(t *testing.T) {
@@ -25,3 +27,55 @@ func TestPrintOperandVersions(t *testing.T) {
 		t.Errorf("Expected: %s, got: %s", expectedOutput, got)
 	}
 }
+
+func TestOperatorStatusProgressing(t *testing.T) {
+	type tCase struct {
+		oV       []osconfigv1.OperandVersion
+		expected osconfigv1.ConditionStatus
+	}
+	tCases := []tCase{
+		{
+			oV: []osconfigv1.OperandVersion{
+				{
+					Name:    "operator",
+					Version: "1.0",
+				},
+			},
+			expected: osconfigv1.ConditionFalse,
+		},
+		{
+			oV: []osconfigv1.OperandVersion{
+				{
+					Name:    "operator",
+					Version: "2.0",
+				},
+			},
+			expected: osconfigv1.ConditionTrue,
+		},
+	}
+
+	optr := Operator{
+		operandVersions: []osconfigv1.OperandVersion{
+			{
+				Name:    "operator",
+				Version: "1.0",
+			},
+		},
+	}
+	for i, tc := range tCases {
+		co := &osconfigv1.ClusterOperator{ObjectMeta: metav1.ObjectMeta{Name: clusterOperatorName}}
+		co.Status.Versions = tc.oV
+
+		optr.osClient = fakeconfigclientset.NewSimpleClientset(co)
+		optr.statusProgressing()
+		o, _ := optr.osClient.ConfigV1().ClusterOperators().Get(clusterOperatorName, metav1.GetOptions{})
+		var condition osconfigv1.ClusterOperatorStatusCondition
+		for _, coCondition := range o.Status.Conditions {
+			if coCondition.Type == osconfigv1.OperatorProgressing {
+				condition = coCondition
+				break
+			}
+		}
+		assert.Equal(t, tc.expected, condition.Status, "test-case %v expected condition %v to be %v, but got %v", i, condition.Type, tc.expected, condition.Status)
+	}
+}