chore: Fix lint

mrueg · mrueg · commit c3c552821af3 · 2023-07-13T10:35:24.000+02:00
Signed-off-by: Manuel Rüger &lt;manuel@rueg.eu&gt;
diff --git a/internal/store/certificatesigningrequest.go b/internal/store/certificatesigningrequest.go
@@ -147,12 +147,14 @@ func wrapCSRFunc(f func(*certv1.CertificateSigningRequest) *metric.Family) func(
 	}
 }
 
-func createCSRListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {
+func createCSRListWatch(kubeClient clientset.Interface, _ string, fieldSelector 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
@@ -132,7 +132,7 @@ func clusterRoleMetricFamilies(allowAnnotationsList, allowLabelsList []string) [
 	}
 }
 
-func createClusterRoleListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {
+func createClusterRoleListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
 			opts.FieldSelector = fieldSelector
diff --git a/internal/store/clusterrolebinding.go b/internal/store/clusterrolebinding.go
@@ -134,7 +134,7 @@ func clusterRoleBindingMetricFamilies(allowAnnotationsList, allowLabelsList []st
 	}
 }
 
-func createClusterRoleBindingListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {
+func createClusterRoleBindingListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
 			opts.FieldSelector = fieldSelector
diff --git a/internal/store/endpointslice.go b/internal/store/endpointslice.go
@@ -225,9 +225,11 @@ func wrapEndpointSliceFunc(f func(*discoveryv1.EndpointSlice) *metric.Family) fu
 func createEndpointSliceListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
+			opts.FieldSelector = fieldSelector
 			return kubeClient.DiscoveryV1().EndpointSlices(ns).List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
+			opts.FieldSelector = fieldSelector
 			return kubeClient.DiscoveryV1().EndpointSlices(ns).Watch(context.TODO(), opts)
 		},
 	}
diff --git a/internal/store/ingressclass.go b/internal/store/ingressclass.go
@@ -128,12 +128,14 @@ func wrapIngressClassFunc(f func(*networkingv1.IngressClass) *metric.Family) fun
 	}
 }
 
-func createIngressClassListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {
+func createIngressClassListWatch(kubeClient clientset.Interface, _ string, fieldSelector 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/mutatingwebhookconfiguration.go b/internal/store/mutatingwebhookconfiguration.go
@@ -85,12 +85,14 @@ var (
 	}
 )
 
-func createMutatingWebhookConfigurationListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {
+func createMutatingWebhookConfigurationListWatch(kubeClient clientset.Interface, _ string, fieldSelector 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
@@ -169,12 +169,14 @@ func wrapNamespaceFunc(f func(*v1.Namespace) *metric.Family) func(interface{}) *
 	}
 }
 
-func createNamespaceListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {
+func createNamespaceListWatch(kubeClient clientset.Interface, _ string, fieldSelector 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
@@ -489,12 +489,14 @@ func wrapNodeFunc(f func(*v1.Node) *metric.Family) func(interface{}) *metric.Fam
 	}
 }
 
-func createNodeListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {
+func createNodeListWatch(kubeClient clientset.Interface, _ string, fieldSelector 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
@@ -338,12 +338,14 @@ func wrapPersistentVolumeFunc(f func(*v1.PersistentVolume) *metric.Family) func(
 	}
 }
 
-func createPersistentVolumeListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {
+func createPersistentVolumeListWatch(kubeClient clientset.Interface, _ string, fieldSelector 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/storageclass.go b/internal/store/storageclass.go
@@ -140,12 +140,14 @@ func wrapStorageClassFunc(f func(*storagev1.StorageClass) *metric.Family) func(i
 	}
 }
 
-func createStorageClassListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {
+func createStorageClassListWatch(kubeClient clientset.Interface, _ string, fieldSelector 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)
 		},
 	}
diff --git a/internal/store/validatingwebhookconfiguration.go b/internal/store/validatingwebhookconfiguration.go
@@ -85,12 +85,14 @@ var (
 	}
 )
 
-func createValidatingWebhookConfigurationListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {
+func createValidatingWebhookConfigurationListWatch(kubeClient clientset.Interface, _ string, fieldSelector 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)
 		},
 	}
diff --git a/pkg/app/server_test.go b/pkg/app/server_test.go
@@ -880,7 +880,7 @@ func (f *fooFactory) Name() string {
 }
 
 // CreateClient use fake client set to establish 10 foos.
-func (f *fooFactory) CreateClient(cfg *rest.Config) (interface{}, error) {
+func (f *fooFactory) CreateClient(_ *rest.Config) (interface{}, error) {
 	fooClient := samplefake.NewSimpleClientset()
 	for i := 0; i < 10; i++ {
 		err := foo(fooClient, i)
diff --git a/pkg/builder/builder_test.go b/pkg/builder/builder_test.go
@@ -63,10 +63,10 @@ func TestBuilderWithCustomStore(t *testing.T) {
 	}
 }
 
-func customStore(metricFamilies []generator.FamilyGenerator,
-	expectedType interface{},
-	listWatchFunc func(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher,
-	useAPIServerCache bool,
+func customStore(_ []generator.FamilyGenerator,
+	_ interface{},
+	_ func(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher,
+	_ bool,
 ) []cache.Store {
 	stores := make([]cache.Store, 0, 2)
 	stores = append(stores, newFakeStore(fakeMetricLists[0]))
@@ -84,15 +84,15 @@ type fakeStore struct {
 	metrics []string
 }
 
-func (s *fakeStore) Add(obj interface{}) error {
+func (s *fakeStore) Add(_ interface{}) error {
 	return nil
 }
 
-func (s *fakeStore) Update(obj interface{}) error {
+func (s *fakeStore) Update(_ interface{}) error {
 	return nil
 }
 
-func (s *fakeStore) Delete(obj interface{}) error {
+func (s *fakeStore) Delete(_ interface{}) error {
 	return nil
 }
 
@@ -109,15 +109,15 @@ func (s *fakeStore) ListKeys() []string {
 	return nil
 }
 
-func (s *fakeStore) Get(obj interface{}) (item interface{}, exists bool, err error) {
+func (s *fakeStore) Get(_ interface{}) (item interface{}, exists bool, err error) {
 	return nil, false, nil
 }
 
-func (s *fakeStore) GetByKey(key string) (item interface{}, exists bool, err error) {
+func (s *fakeStore) GetByKey(_ string) (item interface{}, exists bool, err error) {
 	return nil, false, nil
 }
 
-func (s *fakeStore) Replace(list []interface{}, _ string) error {
+func (s *fakeStore) Replace(_ []interface{}, _ string) error {
 	return nil
 }
 
diff --git a/pkg/metrics_store/metrics_store.go b/pkg/metrics_store/metrics_store.go
@@ -113,12 +113,12 @@ func (s *MetricsStore) ListKeys() []string {
 }
 
 // Get implements the Get method of the store interface.
-func (s *MetricsStore) Get(obj interface{}) (item interface{}, exists bool, err error) {
+func (s *MetricsStore) Get(_ interface{}) (item interface{}, exists bool, err error) {
 	return nil, false, nil
 }
 
 // GetByKey implements the GetByKey method of the store interface.
-func (s *MetricsStore) GetByKey(key string) (item interface{}, exists bool, err error) {
+func (s *MetricsStore) GetByKey(_ string) (item interface{}, exists bool, err error) {
 	return nil, false, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -147,12 +147,14 @@ func wrapCSRFunc(f func(certv1.CertificateSigningRequest) metric.Family) func(`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`150`		`-func createCSRListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {`
	`150`	`+func createCSRListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
`151`	`151`	`return &cache.ListWatch{`
`152`	`152`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
	`153`	`+ opts.FieldSelector = fieldSelector`
`153`	`154`	`return kubeClient.CertificatesV1().CertificateSigningRequests().List(context.TODO(), opts)`
`154`	`155`	`},`
`155`	`156`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
	`157`	`+ opts.FieldSelector = fieldSelector`
`156`	`158`	`return kubeClient.CertificatesV1().CertificateSigningRequests().Watch(context.TODO(), opts)`
`157`	`159`	`},`
`158`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func clusterRoleMetricFamilies(allowAnnotationsList, allowLabelsList []string) [`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`135`		`-func createClusterRoleListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {`
	`135`	`+func createClusterRoleListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
`136`	`136`	`return &cache.ListWatch{`
`137`	`137`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
`138`	`138`	`opts.FieldSelector = fieldSelector`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func clusterRoleBindingMetricFamilies(allowAnnotationsList, allowLabelsList []st`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
`137`		`-func createClusterRoleBindingListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {`
	`137`	`+func createClusterRoleBindingListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
`138`	`138`	`return &cache.ListWatch{`
`139`	`139`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
`140`	`140`	`opts.FieldSelector = fieldSelector`
Original file line number	Diff line number	Diff line change
`@@ -128,12 +128,14 @@ func wrapIngressClassFunc(f func(networkingv1.IngressClass) metric.Family) fun`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
`131`		`-func createIngressClassListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {`
	`131`	`+func createIngressClassListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
`132`	`132`	`return &cache.ListWatch{`
`133`	`133`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
	`134`	`+ opts.FieldSelector = fieldSelector`
`134`	`135`	`return kubeClient.NetworkingV1().IngressClasses().List(context.TODO(), opts)`
`135`	`136`	`},`
`136`	`137`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
	`138`	`+ opts.FieldSelector = fieldSelector`
`137`	`139`	`return kubeClient.NetworkingV1().IngressClasses().Watch(context.TODO(), opts)`
`138`	`140`	`},`
`139`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,12 +85,14 @@ var (`
`85`	`85`	`}`
`86`	`86`	`)`
`87`	`87`
`88`		`-func createMutatingWebhookConfigurationListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {`
	`88`	`+func createMutatingWebhookConfigurationListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
`89`	`89`	`return &cache.ListWatch{`
`90`	`90`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
	`91`	`+ opts.FieldSelector = fieldSelector`
`91`	`92`	`return kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().List(context.TODO(), opts)`
`92`	`93`	`},`
`93`	`94`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
	`95`	`+ opts.FieldSelector = fieldSelector`
`94`	`96`	`return kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().Watch(context.TODO(), opts)`
`95`	`97`	`},`
`96`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,12 +169,14 @@ func wrapNamespaceFunc(f func(v1.Namespace) metric.Family) func(interface{}) *`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
`172`		`-func createNamespaceListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {`
	`172`	`+func createNamespaceListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
`173`	`173`	`return &cache.ListWatch{`
`174`	`174`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
	`175`	`+ opts.FieldSelector = fieldSelector`
`175`	`176`	`return kubeClient.CoreV1().Namespaces().List(context.TODO(), opts)`
`176`	`177`	`},`
`177`	`178`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
	`179`	`+ opts.FieldSelector = fieldSelector`
`178`	`180`	`return kubeClient.CoreV1().Namespaces().Watch(context.TODO(), opts)`
`179`	`181`	`},`
`180`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -489,12 +489,14 @@ func wrapNodeFunc(f func(v1.Node) metric.Family) func(interface{}) *metric.Fam`
`489`	`489`	`}`
`490`	`490`	`}`
`491`	`491`
`492`		`-func createNodeListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {`
	`492`	`+func createNodeListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
`493`	`493`	`return &cache.ListWatch{`
`494`	`494`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
	`495`	`+ opts.FieldSelector = fieldSelector`
`495`	`496`	`return kubeClient.CoreV1().Nodes().List(context.TODO(), opts)`
`496`	`497`	`},`
`497`	`498`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
	`499`	`+ opts.FieldSelector = fieldSelector`
`498`	`500`	`return kubeClient.CoreV1().Nodes().Watch(context.TODO(), opts)`
`499`	`501`	`},`
`500`	`502`	`}`
Original file line number	Diff line number	Diff line change
`@@ -338,12 +338,14 @@ func wrapPersistentVolumeFunc(f func(v1.PersistentVolume) metric.Family) func(`
`338`	`338`	`}`
`339`	`339`	`}`
`340`	`340`
`341`		`-func createPersistentVolumeListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {`
	`341`	`+func createPersistentVolumeListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
`342`	`342`	`return &cache.ListWatch{`
`343`	`343`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
	`344`	`+ opts.FieldSelector = fieldSelector`
`344`	`345`	`return kubeClient.CoreV1().PersistentVolumes().List(context.TODO(), opts)`
`345`	`346`	`},`
`346`	`347`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
	`348`	`+ opts.FieldSelector = fieldSelector`
`347`	`349`	`return kubeClient.CoreV1().PersistentVolumes().Watch(context.TODO(), opts)`
`348`	`350`	`},`
`349`	`351`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,12 +140,14 @@ func wrapStorageClassFunc(f func(storagev1.StorageClass) metric.Family) func(i`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
`143`		`-func createStorageClassListWatch(kubeClient clientset.Interface, ns string, fieldSelector string) cache.ListerWatcher {`
	`143`	`+func createStorageClassListWatch(kubeClient clientset.Interface, _ string, fieldSelector string) cache.ListerWatcher {`
`144`	`144`	`return &cache.ListWatch{`
`145`	`145`	`ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {`
	`146`	`+ opts.FieldSelector = fieldSelector`
`146`	`147`	`return kubeClient.StorageV1().StorageClasses().List(context.TODO(), opts)`
`147`	`148`	`},`
`148`	`149`	`WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {`
	`150`	`+ opts.FieldSelector = fieldSelector`
`149`	`151`	`return kubeClient.StorageV1().StorageClasses().Watch(context.TODO(), opts)`
`150`	`152`	`},`
`151`	`153`	`}`