From 521f8faafb5645aac841fc6dc80f9c1dbe84a462 Mon Sep 17 00:00:00 2001
From: Zhiwei Yin <zyin@redhat.com>
Date: Wed, 5 Jun 2024 11:26:49 +0800
Subject: [PATCH] update ocp version if there is only 1 history item in
 clusterVersion

Signed-off-by: Zhiwei Yin <zyin@redhat.com>
---
 pkg/klusterlet/clusterclaim/clusterclaimer.go |  4 +
 .../clusterclaim/clusterclaimer_test.go       | 80 ++++++++++++++++++-
 2 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/pkg/klusterlet/clusterclaim/clusterclaimer.go b/pkg/klusterlet/clusterclaim/clusterclaimer.go
index 111ac7c2a..d7e0c5fe4 100644
--- a/pkg/klusterlet/clusterclaim/clusterclaimer.go
+++ b/pkg/klusterlet/clusterclaim/clusterclaimer.go
@@ -335,6 +335,10 @@ func (c *ClusterClaimer) getOCPVersion() (version, clusterID string, err error)
 	clusterID = string(clusterVersion.Spec.ClusterID)
 	historyItems := clusterVersion.Status.History
 
+	if len(historyItems) == 1 {
+		return historyItems[0].Version, clusterID, nil
+	}
+
 	var latestCompleteTime *metav1.Time
 	var latestCompleteVersion string
 
diff --git a/pkg/klusterlet/clusterclaim/clusterclaimer_test.go b/pkg/klusterlet/clusterclaim/clusterclaimer_test.go
index 06849763f..388d22628 100644
--- a/pkg/klusterlet/clusterclaim/clusterclaimer_test.go
+++ b/pkg/klusterlet/clusterclaim/clusterclaimer_test.go
@@ -22,6 +22,70 @@ import (
 	"k8s.io/client-go/restmapper"
 )
 
+func newClusterVersionSingleHistory() *apiconfigv1.ClusterVersion {
+	now := metav1.Now()
+	oneMonth := metav1.NewTime(now.AddDate(0, 1, 0))
+	return &apiconfigv1.ClusterVersion{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "version",
+		},
+		Spec: apiconfigv1.ClusterVersionSpec{
+			ClusterID: "ffd989a0-8391-426d-98ac-86ae6d051433",
+			Upstream:  "https://api.openshift.com/api/upgrades_info/v1/graph",
+			Channel:   "stable-4.5",
+		},
+		Status: apiconfigv1.ClusterVersionStatus{
+			ObservedGeneration: 1,
+			VersionHash:        "4lK_pl-YbSw=",
+			Desired: apiconfigv1.Release{
+				Channels: []string{
+					"candidate-4.6",
+					"candidate-4.7",
+					"eus-4.6",
+					"fast-4.6",
+					"fast-4.7",
+					"stable-4.6",
+					"stable-4.7",
+				},
+				Image:   "quay.io/openshift-release-dev/ocp-release@sha256:6ddbf56b7f9776c0498f23a54b65a06b3b846c1012200c5609c4bb716b6bdcdf",
+				URL:     "https://access.redhat.com/errata/RHSA-2020:5259",
+				Version: "4.6.8",
+			},
+			History: []apiconfigv1.UpdateHistory{
+				{
+					Image:          "quay.io/openshift-release-dev/ocp-release@sha256:4d048ae1274d11c49f9b7e70713a072315431598b2ddbb512aee4027c422fe3e",
+					State:          "Completed",
+					Verified:       false,
+					Version:        "4.7.9",
+					CompletionTime: &oneMonth,
+				},
+			},
+			AvailableUpdates: []apiconfigv1.Release{
+				{
+					Channels: []string{
+						"candidate-4.6",
+						"candidate-4.7",
+						"eus-4.6",
+						"fast-4.6",
+						"fast-4.7",
+						"stable-4.6",
+						"stable-4.7",
+					},
+					Image:   "quay.io/openshift-release-dev/ocp-release@sha256:6ddbf56b7f9776c0498f23a54b65a06b3b846c1012200c5609c4bb716b6bdcdf",
+					URL:     "https://access.redhat.com/errata/RHSA-2020:5259",
+					Version: "4.6.8",
+				},
+			},
+			Conditions: []apiconfigv1.ClusterOperatorStatusCondition{
+				{
+					Type:   "Failing",
+					Status: "False",
+				},
+			},
+		},
+	}
+}
+
 func newClusterVersion() *apiconfigv1.ClusterVersion {
 	now := metav1.Now()
 	oneDay := metav1.NewTime(now.AddDate(0, 0, 1))
@@ -214,9 +278,12 @@ func newROKSInfrastructure() *apiconfigv1.Infrastructure {
 
 func newConfigV1Client(version string, platformType string) openshiftclientset.Interface {
 	clusterVersion := &apiconfigv1.ClusterVersion{}
-	if version == "4.x" {
+	switch version {
+	case "4.x":
 		clusterVersion = newClusterVersion()
-	} else {
+	case "4.x-1":
+		clusterVersion = newClusterVersionSingleHistory()
+	default:
 		return configfake.NewSimpleClientset(clusterVersion)
 	}
 
@@ -774,6 +841,15 @@ func TestGetOCPVersion(t *testing.T) {
 			expectClusterID: "ffd989a0-8391-426d-98ac-86ae6d051433",
 			expectErr:       nil,
 		},
+		{
+			name:            "is OCP 4.x-1",
+			kubeClient:      newFakeKubeClient(nil),
+			mapper:          newFakeRestMapper([]*restmapper.APIGroupResources{projectAPIGroupResources}),
+			configV1Client:  newConfigV1Client("4.x-1", ""),
+			expectVersion:   "4.7.9",
+			expectClusterID: "ffd989a0-8391-426d-98ac-86ae6d051433",
+			expectErr:       nil,
+		},
 		{
 			name:            "is not OCP",
 			kubeClient:      newFakeKubeClient(nil),