diff --git a/internal/store/clusterrole.go b/internal/store/clusterrole.go index d1d11a2875..167f3f9b17 100644 --- 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/endpointslice.go b/internal/store/endpointslice.go index 0b01284468..548e0ef09d 100644 --- 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/pkg/app/server_test.go b/pkg/app/server_test.go index 3611b925ed..2e59474cfb 100644 --- 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 index 7189cb1c66..0ceac21abf 100644 --- 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 index 80d7149781..25b4bb4950 100644 --- 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 }