store: fix missing cluster-scoped resources

dgrisonnet · dgrisonnet · commit cf00170dd4be · 2023-09-12T09:40:21.000+02:00
Signed-off-by: Damien Grisonnet &lt;dgrisonn@redhat.com&gt;
diff --git a/internal/store/clusterrolebinding.go b/internal/store/clusterrolebinding.go
@@ -140,14 +140,12 @@ func clusterRoleBindingMetricFamilies(allowAnnotationsList, allowLabelsList []st
 	}
 }
 
-func createClusterRoleBindingListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {
+func createClusterRoleBindingListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.RbacV1().ClusterRoleBindings().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.RbacV1().ClusterRoleBindings().Watch(context.TODO(), opts)
 		},
 	}
diff --git a/internal/store/ingressclass.go b/internal/store/ingressclass.go
@@ -134,14 +134,12 @@ func wrapIngressClassFunc(f func(*networkingv1.IngressClass) *metric.Family) fun
 	}
 }
 
-func createIngressClassListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {
+func createIngressClassListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.NetworkingV1().IngressClasses().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.NetworkingV1().IngressClasses().Watch(context.TODO(), opts)
 		},
 	}
diff --git a/internal/store/storageclass.go b/internal/store/storageclass.go
@@ -146,14 +146,12 @@ func wrapStorageClassFunc(f func(*storagev1.StorageClass) *metric.Family) func(i
 	}
 }
 
-func createStorageClassListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {
+func createStorageClassListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.StorageV1().StorageClasses().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.StorageV1().StorageClasses().Watch(context.TODO(), opts)
 		},
 	}

Original file line number	Diff line number	Diff line change
`@@ -140,14 +140,12 @@ func clusterRoleBindingMetricFamilies(allowAnnotationsList, allowLabelsList []st`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
`143`		`-func createClusterRoleBindingListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
	`143`	`+func createClusterRoleBindingListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {`
`144`	`144`	`return &cache.ListWatch{`
`145`	`145`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
`146`		`- opts.FieldSelector = fieldSelector`
`147`	`146`	`return kubeClient.RbacV1().ClusterRoleBindings().List(context.TODO(), opts)`
`148`	`147`	`},`
`149`	`148`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
`150`		`- opts.FieldSelector = fieldSelector`
`151`	`149`	`return kubeClient.RbacV1().ClusterRoleBindings().Watch(context.TODO(), opts)`
`152`	`150`	`},`
`153`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,14 +134,12 @@ func wrapIngressClassFunc(f func(networkingv1.IngressClass) metric.Family) fun`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
`137`		`-func createIngressClassListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
	`137`	`+func createIngressClassListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {`
`138`	`138`	`return &cache.ListWatch{`
`139`	`139`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
`140`		`- opts.FieldSelector = fieldSelector`
`141`	`140`	`return kubeClient.NetworkingV1().IngressClasses().List(context.TODO(), opts)`
`142`	`141`	`},`
`143`	`142`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
`144`		`- opts.FieldSelector = fieldSelector`
`145`	`143`	`return kubeClient.NetworkingV1().IngressClasses().Watch(context.TODO(), opts)`
`146`	`144`	`},`
`147`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,14 +146,12 @@ func wrapStorageClassFunc(f func(storagev1.StorageClass) metric.Family) func(i`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
`149`		`-func createStorageClassListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
	`149`	`+func createStorageClassListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {`
`150`	`150`	`return &cache.ListWatch{`
`151`	`151`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
`152`		`- opts.FieldSelector = fieldSelector`
`153`	`152`	`return kubeClient.StorageV1().StorageClasses().List(context.TODO(), opts)`
`154`	`153`	`},`
`155`	`154`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
`156`		`- opts.FieldSelector = fieldSelector`
`157`	`155`	`return kubeClient.StorageV1().StorageClasses().Watch(context.TODO(), opts)`
`158`	`156`	`},`
`159`	`157`	`}`