Update GetClusterVersion to return cv.Status.History[0] if no complet…

…ed update exists

pkg/operator/helpers.go

@@ -30,6 +30,7 @@ func ShouldUsePodSecurityStandard(ctx context.Context, client client.Client) (bo
 	if err != nil {
 		return false, err
 	}
+
 	vers, err := version.GetClusterVersion(cv)
 	if err != nil {
 		return false, err

pkg/util/version/clusterversion.go

@@ -9,12 +9,28 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 )
 
+// GetClusterVersion fetches the version of the openshift cluster.
+// Note that it assumes the most recently applied version is
+// cv.Status.History[0] assuming the State == Completed.
+// If for some reason there is no cluster version history, it will
+// return the most recently updated version in history
 func GetClusterVersion(cv *configv1.ClusterVersion) (*Version, error) {
+	unknownErr := errors.New("unknown cluster version")
+	if cv == nil {
+		return nil, unknownErr
+	}
+
 	for _, history := range cv.Status.History {
 		if history.State == configv1.CompletedUpdate {
 			return ParseVersion(history.Version)
 		}
 	}
 
-	return nil, errors.New("unknown cluster version")
+	// If the cluster history has no completed version, we're most likely installing
+	// so grab the first history version and use it even if it's not completed
+	if len(cv.Status.History) > 0 {
+		return ParseVersion(cv.Status.History[0].Version)
+	}
+
+	return nil, unknownErr
 }

pkg/util/version/clusterversion_test.go

@@ -0,0 +1,110 @@
+package version
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the Apache License 2.0.
+
+import (
+	"reflect"
+	"testing"
+
+	utilerror "github.com/Azure/ARO-RP/test/util/error"
+	configv1 "github.com/openshift/api/config/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestGetClusterVersion(t *testing.T) {
+	for _, tt := range []struct {
+		name     string
+		wantVers *Version
+		mocks    func(*configv1.ClusterVersion)
+		wantErr  string
+	}{
+		{
+			name: "cluster version nil returns error",
+			mocks: func(cv *configv1.ClusterVersion) {
+				cv = nil
+			},
+			wantErr: "unknown cluster version",
+		},
+		{
+			name:    "no update history returns error",
+			wantErr: "unknown cluster version",
+		},
+		{
+			name:     "multiple completed updates returns top most",
+			wantVers: NewVersion(4, 10, 0),
+			mocks: func(cv *configv1.ClusterVersion) {
+				cv.Status.History = append(cv.Status.History,
+					configv1.UpdateHistory{
+						State:   configv1.CompletedUpdate,
+						Version: "4.10.0",
+					},
+					configv1.UpdateHistory{
+						State:   configv1.CompletedUpdate,
+						Version: "4.9.0",
+					},
+				)
+			},
+		},
+		{
+			name:     "pending update topmost, returns most recent completed update",
+			wantVers: NewVersion(4, 9, 0),
+			mocks: func(cv *configv1.ClusterVersion) {
+				cv.Status.History = append(cv.Status.History,
+					configv1.UpdateHistory{
+						State:   configv1.PartialUpdate,
+						Version: "4.10.0",
+					},
+					configv1.UpdateHistory{
+						State:   configv1.CompletedUpdate,
+						Version: "4.9.0",
+					},
+				)
+			},
+		},
+		{
+			name:     "only partial update in history returns partial update",
+			wantVers: NewVersion(4, 10, 0),
+			mocks: func(cv *configv1.ClusterVersion) {
+				cv.Status.History = append(cv.Status.History,
+					configv1.UpdateHistory{
+						State:   configv1.PartialUpdate,
+						Version: "4.10.0",
+					},
+				)
+			},
+		},
+		{
+			name:     "missing update history state and no completed returns version",
+			wantVers: NewVersion(4, 10, 0),
+			mocks: func(cv *configv1.ClusterVersion) {
+				cv.Status.History = append(cv.Status.History,
+					configv1.UpdateHistory{
+						Version: "4.10.0",
+					},
+				)
+			},
+		},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			cv := &configv1.ClusterVersion{
+				ObjectMeta: v1.ObjectMeta{
+					Name: "version",
+				},
+				Status: configv1.ClusterVersionStatus{
+					History: []configv1.UpdateHistory{},
+				},
+			}
+
+			if tt.mocks != nil {
+				tt.mocks(cv)
+			}
+			version, err := GetClusterVersion(cv)
+			utilerror.AssertErrorMessage(t, err, tt.wantErr)
+
+			if !reflect.DeepEqual(version, tt.wantVers) {
+				t.Error(version)
+			}
+		})
+	}
+}