upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-11 09:53:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix nil check for store metrics

Browse source
This commit is contained in:
Michael Aspinwall 2026-05-18 18:19:58 +00:00
parent 9991d72c6b
commit e50a7f3dbc
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
staging/src/k8s.io/client-go/tools/cache/store.go vendored
View file

@ -402,6 +402,9 @@ func WithTransformer(transformer TransformFunc) StoreOption {
func WithStoreMetrics(identifier InformerNameAndResource, metrics InformerMetricsProvider) StoreOption {
return func(c *cache) {
c.identifier = identifier
if metrics == nil {
metrics = globalInformerMetricsProvider
}
c.metrics = metrics
}
}

17
staging/src/k8s.io/client-go/tools/cache/store_test.go vendored
View file

@ -22,6 +22,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
)
@ -246,3 +247,19 @@ func TestCacheTransactionShouldIndexErrors(t *testing.T) {
})
}
}
func TestWithStoreMetricsDefaulting(t *testing.T) {
name, err := NewInformerName("test-informer")
if err != nil {
t.Fatalf("failed to create informer name: %v", err)
}
defer name.Release()
gvr := schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "deployments"}
id := name.WithResource(gvr)
s := NewStore(testStoreKeyFunc, WithStoreMetrics(id, nil)).(*cache)
if s.metrics == nil {
t.Errorf("expected c.metrics to be populated, got nil")
}
}