Skip to content

Fix API resource discovery to properly parse GroupVersion #259

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

Draft
leo8a wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix API resource discovery to properly parse GroupVersion #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a706c53
Fix API resource discovery to properly parse GroupVersion
leo8a Jan 26, 2026
c432395
Fix test mock to set GroupVersion on APIResourceList
leo8a Feb 7, 2026
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
2 changes: 1 addition & 1 deletion ...-creator/report/testdata/CreationOfMissingCRsAndUnmatchedCRsAndDiffTestsSuitesWhenNoDiffs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Summary":{"ValidationIssuses":{},"NumMissing":0,"UnmatchedCRS":[],"NumDiffCRs":0,"TotalCRs":27,"MetadataHash":"933892b7ae8a4f5232734acc34f6c93fc223844d836b37af390cfeaecf0b7a99","patchedCRs":0},"Diffs":[{"DiffOutput":"","CorrelatedTemplate":"cm.yaml","CRName":"v1_ConfigMap_kubernetes-dashboard_kubernetes-dashboard-settings"},{"DiffOutput":"","CorrelatedTemplate":"cr.yaml","CRName":"rbac.authorization.k8s.io/v1_ClusterRole_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"crb.yaml","CRName":"rbac.authorization.k8s.io/v1_ClusterRoleBinding_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"deploymentDashboard.yaml","CRName":"apps/v1_Deployment_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"deploymentMetrics.yaml","CRName":"apps/v1_Deployment_kubernetes-dashboard_dashboard-metrics-scraper"},{"DiffOutput":"","CorrelatedTemplate":"ns.yaml","CRName":"v1_Namespace_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"rb.yaml","CRName":"rbac.authorization.k8s.io/v1_RoleBinding_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"role.yaml","CRName":"rbac.authorization.k8s.io/v1_Role_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"sa.yaml","CRName":"v1_ServiceAccount_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-certs"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-csrf"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-key-holder"},{"DiffOutput":"","CorrelatedTemplate":"service.yaml","CRName":"v1_Service_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"ns.yaml","CRName":"v1_Namespace_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"sa.yaml","CRName":"v1_ServiceAccount_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"service.yaml","CRName":"v1_Service_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-certs"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-csrf"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-key-holder"},{"DiffOutput":"","CorrelatedTemplate":"cm.yaml","CRName":"v1_ConfigMap_kubernetes-dashboard_kubernetes-dashboard-settings"},{"DiffOutput":"","CorrelatedTemplate":"role.yaml","CRName":"rbac.authorization.k8s.io/v1_Role_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"cr.yaml","CRName":"rbac.authorization.k8s.io/v1_ClusterRole_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"rb.yaml","CRName":"rbac.authorization.k8s.io/v1_RoleBinding_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"crb.yaml","CRName":"rbac.authorization.k8s.io/v1_ClusterRoleBinding_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"deploymentDashboard.yaml","CRName":"apps/v1_Deployment_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"service.yaml","CRName":"v1_Service_kubernetes-dashboard_dashboard-metrics-scraper"},{"DiffOutput":"","CorrelatedTemplate":"deploymentMetrics.yaml","CRName":"apps/v1_Deployment_kubernetes-dashboard_dashboard-metrics-scraper"}]}
{"Summary":{"ValidationIssuses":{},"NumMissing":0,"UnmatchedCRS":[],"NumDiffCRs":0,"TotalCRs":14,"MetadataHash":"933892b7ae8a4f5232734acc34f6c93fc223844d836b37af390cfeaecf0b7a99","patchedCRs":0},"Diffs":[{"DiffOutput":"","CorrelatedTemplate":"cm.yaml","CRName":"v1_ConfigMap_kubernetes-dashboard_kubernetes-dashboard-settings"},{"DiffOutput":"","CorrelatedTemplate":"cr.yaml","CRName":"rbac.authorization.k8s.io/v1_ClusterRole_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"crb.yaml","CRName":"rbac.authorization.k8s.io/v1_ClusterRoleBinding_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"deploymentDashboard.yaml","CRName":"apps/v1_Deployment_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"deploymentMetrics.yaml","CRName":"apps/v1_Deployment_kubernetes-dashboard_dashboard-metrics-scraper"},{"DiffOutput":"","CorrelatedTemplate":"ns.yaml","CRName":"v1_Namespace_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"rb.yaml","CRName":"rbac.authorization.k8s.io/v1_RoleBinding_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"role.yaml","CRName":"rbac.authorization.k8s.io/v1_Role_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"sa.yaml","CRName":"v1_ServiceAccount_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-certs"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-csrf"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-key-holder"},{"DiffOutput":"","CorrelatedTemplate":"service.yaml","CRName":"v1_Service_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"service.yaml","CRName":"v1_Service_kubernetes-dashboard_dashboard-metrics-scraper"}]}
49 changes: 5 additions & 44 deletions ...r/report/testdata/CreationOfMissingCRsAndUnmatchedCRsAndDiffTestsSuitesWhenNoDiffs.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuites name="Comparison results of known valid reference configuration and a set of specific cluster CRs" tests="29" failures="0" errors="0" skipped="0" TIME>
<testsuite tests="27" failures="0" skipped="0" TIME name="Detected Differences Between Cluster CRs and Expected CRs" TIME>
<testsuites name="Comparison results of known valid reference configuration and a set of specific cluster CRs" tests="16" failures="0" errors="0" skipped="0" TIME>
<testsuite tests="14" failures="0" skipped="0" TIME name="Detected Differences Between Cluster CRs and Expected CRs" TIME>
<properties>
<property name="MetadataHash" value="933892b7ae8a4f5232734acc34f6c93fc223844d836b37af390cfeaecf0b7a99"></property>
<property name="TotalCRs" value="27"></property>
<property name="TotalCRs" value="14"></property>
</properties>
<testcase classname="Matching Reference CR: cm.yaml" name="CR: v1_ConfigMap_kubernetes-dashboard_kubernetes-dashboard-settings" TIME>
<properties></properties>
Expand Down Expand Up @@ -44,53 +44,14 @@
<testcase classname="Matching Reference CR: service.yaml" name="CR: v1_Service_kubernetes-dashboard_kubernetes-dashboard" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: ns.yaml" name="CR: v1_Namespace_kubernetes-dashboard" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: sa.yaml" name="CR: v1_ServiceAccount_kubernetes-dashboard_kubernetes-dashboard" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: service.yaml" name="CR: v1_Service_kubernetes-dashboard_kubernetes-dashboard" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: secret.yaml" name="CR: v1_Secret_kubernetes-dashboard_kubernetes-dashboard-certs" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: secret.yaml" name="CR: v1_Secret_kubernetes-dashboard_kubernetes-dashboard-csrf" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: secret.yaml" name="CR: v1_Secret_kubernetes-dashboard_kubernetes-dashboard-key-holder" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: cm.yaml" name="CR: v1_ConfigMap_kubernetes-dashboard_kubernetes-dashboard-settings" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: role.yaml" name="CR: rbac.authorization.k8s.io/v1_Role_kubernetes-dashboard_kubernetes-dashboard" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: cr.yaml" name="CR: rbac.authorization.k8s.io/v1_ClusterRole_kubernetes-dashboard" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: rb.yaml" name="CR: rbac.authorization.k8s.io/v1_RoleBinding_kubernetes-dashboard_kubernetes-dashboard" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: crb.yaml" name="CR: rbac.authorization.k8s.io/v1_ClusterRoleBinding_kubernetes-dashboard" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: deploymentDashboard.yaml" name="CR: apps/v1_Deployment_kubernetes-dashboard_kubernetes-dashboard" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: service.yaml" name="CR: v1_Service_kubernetes-dashboard_dashboard-metrics-scraper" TIME>
<properties></properties>
</testcase>
<testcase classname="Matching Reference CR: deploymentMetrics.yaml" name="CR: apps/v1_Deployment_kubernetes-dashboard_dashboard-metrics-scraper" TIME>
<properties></properties>
</testcase>
</testsuite>
<testsuite tests="1" failures="0" skipped="0" TIME name="Reference validation" TIME>
<properties>
<property name="MetadataHash" value="933892b7ae8a4f5232734acc34f6c93fc223844d836b37af390cfeaecf0b7a99"></property>
<property name="TotalCRs" value="27"></property>
<property name="TotalCRs" value="14"></property>
</properties>
<testcase classname="" name="No reference validation issues: All expected CRs exist in the cluster" TIME>
<properties></properties>
Expand All @@ -99,7 +60,7 @@
<testsuite tests="1" failures="0" skipped="0" TIME name="Unmatched Cluster Resources" TIME>
<properties>
<property name="MetadataHash" value="933892b7ae8a4f5232734acc34f6c93fc223844d836b37af390cfeaecf0b7a99"></property>
<property name="TotalCRs" value="27"></property>
<property name="TotalCRs" value="14"></property>
</properties>
<testcase classname="" name="All Cluster CRs are matched to reference CRs " TIME>
<properties></properties>
Expand Down
6 changes: 5 additions & 1 deletion pkg/compare/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,8 +490,12 @@ func getSupportedResourceTypes(client discovery.CachedDiscoveryInterface) (map[s
}
for _, list := range lists {
if len(list.APIResources) != 0 {
gv, err := schema.ParseGroupVersion(list.GroupVersion)
if err != nil {
klog.Warningf("Failed to parse GroupVersion %s: %v", list.GroupVersion, err)
continue
}
for _, res := range list.APIResources {
gv := schema.GroupVersion{Group: res.Group, Version: res.Version}
if !slices.Contains(resources[res.Kind], gv) {
resources[res.Kind] = append(resources[res.Kind], gv)
}
Expand Down
17 changes: 14 additions & 3 deletions pkg/compare/compare_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,8 +848,19 @@ func getResources(t *testing.T, test Test, resourcesDir string) ([]v1.APIResourc

func updateTestDiscoveryClient(tf *cmdtesting.TestFactory, discoveryResources []v1.APIResource) {
discoveryClient := cmdtesting.NewFakeCachedDiscoveryClient()
ResourceList := v1.APIResourceList{APIResources: discoveryResources}
discoveryClient.Resources = append(discoveryClient.Resources, &ResourceList)
discoveryClient.PreferredResources = append(discoveryClient.PreferredResources, &ResourceList)
// Group resources by GroupVersion to match real Kubernetes API behavior
resourcesByGV := make(map[string][]v1.APIResource)
for _, res := range discoveryResources {
gv := res.Version
if res.Group != "" {
gv = res.Group + "/" + res.Version
}
resourcesByGV[gv] = append(resourcesByGV[gv], res)
}
for gv, resources := range resourcesByGV {
list := &v1.APIResourceList{GroupVersion: gv, APIResources: resources}
discoveryClient.Resources = append(discoveryClient.Resources, list)
discoveryClient.PreferredResources = append(discoveryClient.PreferredResources, list)
}
tf.WithDiscoveryClient(discoveryClient)
}