Skip to content

OTA-1966: pkg/readiness/crd_compat: Drop unnecessary CustomResourceDefinition check #1415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jul 2, 2026
Merged

OTA-1966: pkg/readiness/crd_compat: Drop unnecessary CustomResourceDefinition check #1415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 5 additions & 18 deletions pkg/proposal/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,6 @@ func newFakeDynamicClient(objects ...runtime.Object) *dynamicfake.FakeDynamicCli
readiness.GVRNode: "NodeList",
readiness.GVRPod: "PodList",
readiness.GVRPDB: "PodDisruptionBudgetList",
readiness.GVRCRD: "CustomResourceDefinitionList",
readiness.GVRSubscription: "SubscriptionList",
readiness.GVRCSV: "ClusterServiceVersionList",
readiness.GVRInstallPlan: "InstallPlanList",
Expand Down Expand Up @@ -1260,18 +1259,6 @@ func TestGetProposals_WithReadinessData(t *testing.T) {
"conditions": []interface{}{map[string]interface{}{"type": "Deprecated", "status": "True"}},
},
}},
// CRD with version issue
&unstructured.Unstructured{Object: map[string]interface{}{
"apiVersion": "apiextensions.k8s.io/v1", "kind": "CustomResourceDefinition",
"metadata": map[string]interface{}{"name": "widgets.example.com"},
"spec": map[string]interface{}{
"versions": []interface{}{
map[string]interface{}{"name": "v2", "served": true},
map[string]interface{}{"name": "v1", "served": false},
},
},
"status": map[string]interface{}{"storedVersions": []interface{}{"v1"}},
}},
// Network, Proxy, APIServer
&unstructured.Unstructured{Object: map[string]interface{}{
"apiVersion": "config.openshift.io/v1", "kind": "Network",
Expand Down Expand Up @@ -1356,11 +1343,11 @@ func TestGetProposals_WithReadinessData(t *testing.T) {
if !ok {
t.Fatal("readiness output missing 'meta'")
}
if meta["total_checks"] != float64(9) {
t.Errorf("readiness total_checks = %v, want 9", meta["total_checks"])
if meta["total_checks"] != float64(8) {
t.Errorf("readiness total_checks = %v, want 8", meta["total_checks"])
}
if meta["checks_ok"] != float64(9) {
t.Errorf("readiness checks_ok = %v, want 9 (all checks should succeed)", meta["checks_ok"])
if meta["checks_ok"] != float64(8) {
t.Errorf("readiness checks_ok = %v, want 8 (all checks should succeed)", meta["checks_ok"])
}

checks, ok := raw["checks"].(map[string]any)
Expand All @@ -1372,7 +1359,7 @@ func TestGetProposals_WithReadinessData(t *testing.T) {
for _, name := range []string{
"cluster_conditions", "operator_health", "api_deprecations",
"node_capacity", "pdb_drain", "etcd_health", "network",
"crd_compat", "olm_operator_lifecycle",
"olm_operator_lifecycle",
Comment thread
wking marked this conversation as resolved.
} {
check, ok := checks[name].(map[string]any)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
if !ok {
Expand Down
1 change: 0 additions & 1 deletion pkg/readiness/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ var AllChecks = func() []Check {
&PDBDrainCheck{}, // new: PDB drain blockers
&EtcdHealthCheck{}, // new: deep etcd health (beyond CO condition)
&NetworkCheck{}, // new: SDN migration, TLS, proxy
&CRDCompatCheck{}, // new: CRD version mismatches
&OLMOperatorLifecycleCheck{}, // new: OLM operator lifecycle (OCPSTRAT-2618)
// Known issues (Jira/KB) are NOT checked here — the agent uses its
// redhat-support skill to query contextually based on readiness findings.
Expand Down
6 changes: 3 additions & 3 deletions pkg/readiness/check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ func TestRunAllRecoversPanic(t *testing.T) {

func TestAllChecksReturnsExpectedCount(t *testing.T) {
checks := AllChecks()
if len(checks) != 9 {
t.Errorf("AllChecks() returned %d checks, want 9", len(checks))
if len(checks) != 8 {
t.Errorf("AllChecks() returned %d checks, want 8", len(checks))
}

names := make(map[string]bool)
Expand All @@ -253,7 +253,7 @@ func TestAllChecksReturnsExpectedCount(t *testing.T) {

expected := []string{
"cluster_conditions", "operator_health", "api_deprecations",
"node_capacity", "pdb_drain", "etcd_health", "network", "crd_compat",
"node_capacity", "pdb_drain", "etcd_health", "network",
"olm_operator_lifecycle",
}
for _, name := range expected {
Expand Down
124 changes: 3 additions & 121 deletions pkg/readiness/checks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ func newFakeDynamicClient(objects ...runtime.Object) *dynamicfake.FakeDynamicCli
GVRNode: "NodeList",
GVRPod: "PodList",
GVRPDB: "PodDisruptionBudgetList",
GVRCRD: "CustomResourceDefinitionList",
GVRSubscription: "SubscriptionList",
GVRCSV: "ClusterServiceVersionList",
GVRInstallPlan: "InstallPlanList",
Expand Down Expand Up @@ -621,103 +620,6 @@ func TestAPIDeprecationsCheck_NoBlockers(t *testing.T) {
}
}

func TestCRDCompatCheck(t *testing.T) {
objects := []runtime.Object{
// CRD with stored version that is still served — ok
&unstructured.Unstructured{Object: map[string]interface{}{
"apiVersion": "apiextensions.k8s.io/v1", "kind": "CustomResourceDefinition",
"metadata": map[string]interface{}{"name": "widgets.example.com"},
"spec": map[string]interface{}{
"versions": []interface{}{
map[string]interface{}{"name": "v1", "served": true},
map[string]interface{}{"name": "v1beta1", "served": true},
},
},
"status": map[string]interface{}{
"storedVersions": []interface{}{"v1", "v1beta1"},
},
}},
// CRD with stored version that is NO LONGER served — issue
&unstructured.Unstructured{Object: map[string]interface{}{
"apiVersion": "apiextensions.k8s.io/v1", "kind": "CustomResourceDefinition",
"metadata": map[string]interface{}{"name": "gadgets.example.com"},
"spec": map[string]interface{}{
"versions": []interface{}{
map[string]interface{}{"name": "v2", "served": true},
map[string]interface{}{"name": "v1", "served": false},
},
},
"status": map[string]interface{}{
"storedVersions": []interface{}{"v1"},
},
}},
}

client := newFakeDynamicClient(objects...)
check := &CRDCompatCheck{}

result, err := check.Run(context.Background(), client, "4.21.5", "4.21.8")
if err != nil {
t.Fatal(err)
}

if result["total_crds"] != 2 {
t.Errorf("total_crds = %v, want 2", result["total_crds"])
}

issues, ok := result["version_issues"].([]map[string]any)
if !ok {
t.Fatal("version_issues not a slice")
}
if len(issues) != 1 {
t.Fatalf("version_issues len = %d, want 1", len(issues))
}
if issues[0]["crd"] != "gadgets.example.com" {
t.Errorf("crd = %v, want gadgets.example.com", issues[0]["crd"])
}
if issues[0]["stored_version"] != "v1" {
t.Errorf("stored_version = %v, want v1", issues[0]["stored_version"])
}

summary, ok := result["summary"].(map[string]any)
if !ok {
t.Fatal("summary not a map")
}
if summary["version_issues"] != 1 {
t.Errorf("summary.version_issues = %v, want 1", summary["version_issues"])
}
}

func TestCRDCompatCheck_NoIssues(t *testing.T) {
objects := []runtime.Object{
&unstructured.Unstructured{Object: map[string]interface{}{
"apiVersion": "apiextensions.k8s.io/v1", "kind": "CustomResourceDefinition",
"metadata": map[string]interface{}{"name": "things.example.com"},
"spec": map[string]interface{}{
"versions": []interface{}{
map[string]interface{}{"name": "v1", "served": true},
},
},
"status": map[string]interface{}{
"storedVersions": []interface{}{"v1"},
},
}},
}

client := newFakeDynamicClient(objects...)
check := &CRDCompatCheck{}

result, err := check.Run(context.Background(), client, "4.21.5", "4.21.8")
if err != nil {
t.Fatal(err)
}

issues := result["version_issues"].([]map[string]any)
if len(issues) != 0 {
t.Errorf("expected no version issues, got %d", len(issues))
}
}

func TestNetworkCheck(t *testing.T) {
objects := []runtime.Object{
&unstructured.Unstructured{Object: map[string]interface{}{
Expand Down Expand Up @@ -912,19 +814,6 @@ func fakeClusterObjects() []runtime.Object {
},
}},

// --- CRDs (crd_compat) ---
&unstructured.Unstructured{Object: map[string]interface{}{
"apiVersion": "apiextensions.k8s.io/v1", "kind": "CustomResourceDefinition",
"metadata": map[string]interface{}{"name": "widgets.example.com"},
"spec": map[string]interface{}{
"versions": []interface{}{
map[string]interface{}{"name": "v1", "served": true},
map[string]interface{}{"name": "v1beta1", "served": false},
},
},
"status": map[string]interface{}{"storedVersions": []interface{}{"v1beta1"}},
}},

// --- Network, Proxy, APIServer (network) ---
&unstructured.Unstructured{Object: map[string]interface{}{
"apiVersion": "config.openshift.io/v1", "kind": "Network",
Expand Down Expand Up @@ -979,14 +868,14 @@ func TestRunAllWithFakeCluster(t *testing.T) {
if output.TargetVersion != "4.21.8" {
t.Errorf("TargetVersion = %q, want 4.21.8", output.TargetVersion)
}
if output.Meta.TotalChecks != 9 {
t.Errorf("TotalChecks = %d, want 9", output.Meta.TotalChecks)
if output.Meta.TotalChecks != 8 {
t.Errorf("TotalChecks = %d, want 8", output.Meta.TotalChecks)
}

for _, name := range []string{
"cluster_conditions", "operator_health", "api_deprecations",
"node_capacity", "pdb_drain", "etcd_health", "network",
"crd_compat", "olm_operator_lifecycle",
"olm_operator_lifecycle",
} {
r, ok := output.Checks[name]
if !ok {
Expand Down Expand Up @@ -1056,13 +945,6 @@ func TestRunAllWithFakeCluster(t *testing.T) {
t.Errorf("api_deprecations blockers = %v, want 1", adSummary["blockers"])
}

// crd_compat: 1 CRD with stored version no longer served
crd := output.Checks["crd_compat"]
crdSummary := crd.Data["summary"].(map[string]any)
if crdSummary["version_issues"] != 1 {
t.Errorf("crd_compat version_issues = %v, want 1", crdSummary["version_issues"])
}

// network: OVN, proxy configured
nw := output.Checks["network"]
if nw.Data["network_type"] != "OVNKubernetes" {
Expand Down
1 change: 0 additions & 1 deletion pkg/readiness/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ var (
GVRPDB = schema.GroupVersionResource{Group: "policy", Version: "v1", Resource: "poddisruptionbudgets"}
GVRPV = schema.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumes"}
GVRSecret = schema.GroupVersionResource{Group: "", Version: "v1", Resource: "secrets"}
GVRCRD = schema.GroupVersionResource{Group: "apiextensions.k8s.io", Version: "v1", Resource: "customresourcedefinitions"}
GVRCSV = schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "clusterserviceversions"}
GVRSubscription = schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "subscriptions"}
GVRInstallPlan = schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "installplans"}
Expand Down
63 changes: 0 additions & 63 deletions pkg/readiness/crd_compat.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/cvo/readiness.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ var _ = g.Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator r
g.It("should run all checks without errors", func() {
output := readiness.RunAll(ctx, dynamicClient, currentVersion, targetVersion)

o.Expect(output.Meta.TotalChecks).To(o.Equal(9))
o.Expect(output.Meta.TotalChecks).To(o.Equal(8))
o.Expect(output.Meta.ChecksErrored).To(o.Equal(0),
"no check should error on a healthy cluster")
})
Expand Down