Fix: Remove FieldSelector from non-namespaced resources

mrueg · dgrisonnet · commit 023f83dd0346 · 2023-09-12T09:34:14.000+02:00
This should resolve the issue with namespace-denylist as discovered in #2187 Regression introduced in c3c5528 Signed-off-by: Manuel Rüger <manuel@rueg.eu>
diff --git a/internal/store/certificatesigningrequest.go b/internal/store/certificatesigningrequest.go
@@ -153,14 +153,12 @@ func wrapCSRFunc(f func(*certv1.CertificateSigningRequest) *metric.Family) func(
 	}
 }
 
-func createCSRListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {
+func createCSRListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.CertificatesV1().CertificateSigningRequests().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.CertificatesV1().CertificateSigningRequests().Watch(context.TODO(), opts)
 		},
 	}
diff --git a/internal/store/clusterrole.go b/internal/store/clusterrole.go
@@ -138,14 +138,12 @@ func clusterRoleMetricFamilies(allowAnnotationsList, allowLabelsList []string) [
 	}
 }
 
-func createClusterRoleListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {
+func createClusterRoleListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.RbacV1().ClusterRoles().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.RbacV1().ClusterRoles().Watch(context.TODO(), opts)
 		},
 	}
diff --git a/internal/store/mutatingwebhookconfiguration.go b/internal/store/mutatingwebhookconfiguration.go
@@ -111,14 +111,12 @@ var (
 	}
 )
 
-func createMutatingWebhookConfigurationListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {
+func createMutatingWebhookConfigurationListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().Watch(context.TODO(), opts)
 		},
 	}
diff --git a/internal/store/namespace.go b/internal/store/namespace.go
@@ -176,14 +176,12 @@ func wrapNamespaceFunc(f func(*v1.Namespace) *metric.Family) func(interface{}) *
 	}
 }
 
-func createNamespaceListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {
+func createNamespaceListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.CoreV1().Namespaces().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.CoreV1().Namespaces().Watch(context.TODO(), opts)
 		},
 	}
diff --git a/internal/store/node.go b/internal/store/node.go
@@ -495,14 +495,12 @@ func wrapNodeFunc(f func(*v1.Node) *metric.Family) func(interface{}) *metric.Fam
 	}
 }
 
-func createNodeListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {
+func createNodeListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.CoreV1().Nodes().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.CoreV1().Nodes().Watch(context.TODO(), opts)
 		},
 	}
diff --git a/internal/store/persistentvolume.go b/internal/store/persistentvolume.go
@@ -366,14 +366,12 @@ func wrapPersistentVolumeFunc(f func(*v1.PersistentVolume) *metric.Family) func(
 	}
 }
 
-func createPersistentVolumeListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {
+func createPersistentVolumeListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.CoreV1().PersistentVolumes().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.CoreV1().PersistentVolumes().Watch(context.TODO(), opts)
 		},
 	}
diff --git a/internal/store/validatingwebhookconfiguration.go b/internal/store/validatingwebhookconfiguration.go
@@ -111,14 +111,12 @@ var (
 	}
 )
 
-func createValidatingWebhookConfigurationListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {
+func createValidatingWebhookConfigurationListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.AdmissionregistrationV1().ValidatingWebhookConfigurations().List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			opts.FieldSelector = fieldSelector
 			return kubeClient.AdmissionregistrationV1().ValidatingWebhookConfigurations().Watch(context.TODO(), opts)
 		},
 	}

Original file line number	Diff line number	Diff line change
`@@ -153,14 +153,12 @@ func wrapCSRFunc(f func(certv1.CertificateSigningRequest) metric.Family) func(`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`156`		`-func createCSRListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
	`156`	`+func createCSRListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {`
`157`	`157`	`return &cache.ListWatch{`
`158`	`158`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
`159`		`- opts.FieldSelector = fieldSelector`
`160`	`159`	`return kubeClient.CertificatesV1().CertificateSigningRequests().List(context.TODO(), opts)`
`161`	`160`	`},`
`162`	`161`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
`163`		`- opts.FieldSelector = fieldSelector`
`164`	`162`	`return kubeClient.CertificatesV1().CertificateSigningRequests().Watch(context.TODO(), opts)`
`165`	`163`	`},`
`166`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,14 +138,12 @@ func clusterRoleMetricFamilies(allowAnnotationsList, allowLabelsList []string) [`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
`141`		`-func createClusterRoleListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
	`141`	`+func createClusterRoleListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {`
`142`	`142`	`return &cache.ListWatch{`
`143`	`143`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
`144`		`- opts.FieldSelector = fieldSelector`
`145`	`144`	`return kubeClient.RbacV1().ClusterRoles().List(context.TODO(), opts)`
`146`	`145`	`},`
`147`	`146`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
`148`		`- opts.FieldSelector = fieldSelector`
`149`	`147`	`return kubeClient.RbacV1().ClusterRoles().Watch(context.TODO(), opts)`
`150`	`148`	`},`
`151`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,14 +111,12 @@ var (`
`111`	`111`	`}`
`112`	`112`	`)`
`113`	`113`
`114`		`-func createMutatingWebhookConfigurationListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
	`114`	`+func createMutatingWebhookConfigurationListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {`
`115`	`115`	`return &cache.ListWatch{`
`116`	`116`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
`117`		`- opts.FieldSelector = fieldSelector`
`118`	`117`	`return kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().List(context.TODO(), opts)`
`119`	`118`	`},`
`120`	`119`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
`121`		`- opts.FieldSelector = fieldSelector`
`122`	`120`	`return kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().Watch(context.TODO(), opts)`
`123`	`121`	`},`
`124`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,14 +176,12 @@ func wrapNamespaceFunc(f func(v1.Namespace) metric.Family) func(interface{}) *`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
`179`		`-func createNamespaceListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
	`179`	`+func createNamespaceListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {`
`180`	`180`	`return &cache.ListWatch{`
`181`	`181`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
`182`		`- opts.FieldSelector = fieldSelector`
`183`	`182`	`return kubeClient.CoreV1().Namespaces().List(context.TODO(), opts)`
`184`	`183`	`},`
`185`	`184`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
`186`		`- opts.FieldSelector = fieldSelector`
`187`	`185`	`return kubeClient.CoreV1().Namespaces().Watch(context.TODO(), opts)`
`188`	`186`	`},`
`189`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -495,14 +495,12 @@ func wrapNodeFunc(f func(v1.Node) metric.Family) func(interface{}) *metric.Fam`
`495`	`495`	`}`
`496`	`496`	`}`
`497`	`497`
`498`		`-func createNodeListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
	`498`	`+func createNodeListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {`
`499`	`499`	`return &cache.ListWatch{`
`500`	`500`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
`501`		`- opts.FieldSelector = fieldSelector`
`502`	`501`	`return kubeClient.CoreV1().Nodes().List(context.TODO(), opts)`
`503`	`502`	`},`
`504`	`503`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
`505`		`- opts.FieldSelector = fieldSelector`
`506`	`504`	`return kubeClient.CoreV1().Nodes().Watch(context.TODO(), opts)`
`507`	`505`	`},`
`508`	`506`	`}`
Original file line number	Diff line number	Diff line change
`@@ -366,14 +366,12 @@ func wrapPersistentVolumeFunc(f func(v1.PersistentVolume) metric.Family) func(`
`366`	`366`	`}`
`367`	`367`	`}`
`368`	`368`
`369`		`-func createPersistentVolumeListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
	`369`	`+func createPersistentVolumeListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {`
`370`	`370`	`return &cache.ListWatch{`
`371`	`371`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
`372`		`- opts.FieldSelector = fieldSelector`
`373`	`372`	`return kubeClient.CoreV1().PersistentVolumes().List(context.TODO(), opts)`
`374`	`373`	`},`
`375`	`374`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
`376`		`- opts.FieldSelector = fieldSelector`
`377`	`375`	`return kubeClient.CoreV1().PersistentVolumes().Watch(context.TODO(), opts)`
`378`	`376`	`},`
`379`	`377`	`}`