Merge pull request #44 from heliapb/fix/op_crd

[FIX] - CRD name bug on Operator Analyser
prometheus-operator · Oct 26, 2024 · 8de95a0 · 8de95a0
2 parents a90a3e1 + 2ef5f8b
commit 8de95a0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/internal/analyzers/operator.go b/internal/analyzers/operator.go
@@ -81,10 +81,10 @@ func analyzeClusterRoleAndCRDRules(ctx context.Context, clientSets *k8sutil.Clie
 }
 
 func analyzeCRDRules(ctx context.Context, clientSets *k8sutil.ClientSets, crb v1.ClusterRoleBinding, rule v1.PolicyRule) error {
-	for _, crd := range crds.List {
-		crd, err := clientSets.APIExtensionsClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, crd, metav1.GetOptions{})
+	for _, crdName := range crds.List {
+		crd, err := clientSets.APIExtensionsClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, crdName, metav1.GetOptions{})
 		if err != nil {
-			return fmt.Errorf("failed to get CRD %s", crd)
+			return fmt.Errorf("failed to get CRD %s", crdName)
 		}
 
 		found := false

diff --git a/internal/crds/crds.go b/internal/crds/crds.go
@@ -16,15 +16,15 @@ package crds
 
 var (
 	List = []string{
-		"alertmanagers",
-		"alertmanagerconfigs",
-		"podmonitors",
-		"probes",
-		"prometheusagents",
-		"prometheuses",
-		"prometheusrules",
-		"scrapeconfigs",
-		"servicemonitors",
-		"thanosrulers",
+        "alertmanagers.monitoring.coreos.com",
+        "alertmanagerconfigs.monitoring.coreos.com",
+        "podmonitors.monitoring.coreos.com",
+        "probes.monitoring.coreos.com",
+        "prometheusagents.monitoring.coreos.com",
+        "prometheuses.monitoring.coreos.com",
+        "prometheusrules.monitoring.coreos.com",
+        "scrapeconfigs.monitoring.coreos.com",
+        "servicemonitors.monitoring.coreos.com",
+        "thanosrulers.monitoring.coreos.com",
 	}
 )