Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions pkg/readiness/checks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -473,10 +473,6 @@ func TestClusterConditionsCheck(t *testing.T) {
if result["channel"] != "stable-4.21" {
Comment thread
jrangelramos marked this conversation as resolved.
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")
Expand Down
2 changes: 0 additions & 2 deletions pkg/readiness/cluster_conditions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 0 additions & 2 deletions test/cvo/readiness.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down