Skip to content

Commit 12e274b

Browse files
authored
Merge pull request kubernetes#130236 from adrianmoisey/add-test-for-deleted-entries-metric
Add test for ReconcileConntrackFlowsDeletedEntriesTotal metric
2 parents 5d28e86 + 438d496 commit 12e274b

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

pkg/proxy/conntrack/cleanup_test.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ import (
3434
discovery "k8s.io/api/discovery/v1"
3535
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3636
"k8s.io/apimachinery/pkg/types"
37+
"k8s.io/component-base/metrics/legacyregistry"
38+
"k8s.io/component-base/metrics/testutil"
3739
"k8s.io/kubernetes/pkg/proxy"
40+
"k8s.io/kubernetes/pkg/proxy/metrics"
3841
netutils "k8s.io/utils/net"
3942
"k8s.io/utils/ptr"
4043
)
@@ -306,9 +309,15 @@ func TestCleanStaleEntries(t *testing.T) {
306309
t.Logf("entries before cleanup %d after cleanup %d", len(entriesBeforeCleanup), len(entriesAfterCleanup))
307310
fake := NewFake()
308311
fake.entries = entriesBeforeCleanup
309-
CleanStaleEntries(fake, testIPFamily, svcPortMap, endpointsMap)
310312

313+
legacyregistry.MustRegister(metrics.ReconcileConntrackFlowsDeletedEntriesTotal)
314+
CleanStaleEntries(fake, testIPFamily, svcPortMap, endpointsMap)
311315
actualEntries, _ := fake.ListEntries(ipFamilyMap[testIPFamily])
316+
317+
metricCount, err := testutil.GetCounterMetricValue(metrics.ReconcileConntrackFlowsDeletedEntriesTotal.WithLabelValues(string(testIPFamily)))
318+
require.NoError(t, err)
319+
require.Equal(t, int(metricCount), len(entriesBeforeCleanup)-len(entriesAfterCleanup))
320+
312321
require.Equal(t, len(entriesAfterCleanup), len(actualEntries))
313322

314323
// sort the actual flows before comparison

0 commit comments

Comments
 (0)