diff --git a/pkg/readiness/checks_test.go b/pkg/readiness/checks_test.go index 00c307d554..cd9eced156 100644 --- a/pkg/readiness/checks_test.go +++ b/pkg/readiness/checks_test.go @@ -473,10 +473,6 @@ func TestClusterConditionsCheck(t *testing.T) { if result["channel"] != "stable-4.21" { t.Errorf("channel = %v, want stable-4.21", result["channel"]) } - if result["cluster_id"] != "test-cluster-id-123" { - t.Errorf("cluster_id = %v, want test-cluster-id-123", result["cluster_id"]) - } - history, ok := result["recent_history"].([]map[string]any) if !ok { t.Fatal("recent_history not a slice") diff --git a/pkg/readiness/cluster_conditions.go b/pkg/readiness/cluster_conditions.go index 5a770c2a6c..f2ba7f2b58 100644 --- a/pkg/readiness/cluster_conditions.go +++ b/pkg/readiness/cluster_conditions.go @@ -82,9 +82,7 @@ func (c *ClusterConditionsCheck) Run(ctx context.Context, dc dynamic.Interface, } result["recent_history"] = historyEntries - // Channel and cluster identity result["channel"] = NestedString(cv.Object, "spec", "channel") - result["cluster_id"] = NestedString(cv.Object, "spec", "clusterID") return result, nil } diff --git a/test/cvo/readiness.go b/test/cvo/readiness.go index 8bcac9e146..ca23cfacad 100644 --- a/test/cvo/readiness.go +++ b/test/cvo/readiness.go @@ -224,8 +224,6 @@ var _ = g.Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator r o.Expect(result.Status).To(o.Equal("ok")) o.Expect(result.Data["channel"]).To(o.Equal(cv.Spec.Channel), "channel should match ClusterVersion spec") - o.Expect(result.Data["cluster_id"]).To(o.Equal(string(cv.Spec.ClusterID)), - "cluster ID should match ClusterVersion spec") }) g.It("should complete all checks within 60 seconds", func() {