github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conditionally register nfacct metrics and ensure nfacct counters

Browse Source 
If the nfacct sub-system is not available in the kernel then:
1. nfacct based metrics won't be registered.
2. proxier will not attempt to ensure the counters

Signed-off-by: Daman Arora <aroradaman@gmail.com>
This commit is contained in:
Daman Arora
2024-07-03 17:57:11 +05:30
parent 75b18b86dd
commit 33bac685a7
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/proxy/iptables/proxier.go
View File

@@ -280,7 +280,7 @@ func NewProxier(ctx context.Context,
serviceHealthServer := healthcheck.NewServiceHealthServer(hostname, recorder, nodePortAddresses, healthzServer) serviceHealthServer := healthcheck.NewServiceHealthServer(hostname, recorder, nodePortAddresses, healthzServer)
nfacctRunner, err := nfacct.New() nfacctRunner, err := nfacct.New()
if err != nil { if err != nil {
logger.Error(err, "Failed to create nfacct runner") logger.Error(err, "Failed to create nfacct runner, nfacct based metrics won't be available")
} }
proxier := &Proxier{ proxier := &Proxier{

5
pkg/proxy/metrics/metrics.go
View File

@@ -299,8 +299,12 @@ func RegisterMetrics(mode kubeproxyconfig.ProxyMode) {
switch mode { switch mode {
case kubeproxyconfig.ProxyModeIPTables: case kubeproxyconfig.ProxyModeIPTables:
if iptablesCTStateInvalidDroppedMetricCollector != nil {
legacyregistry.CustomMustRegister(iptablesCTStateInvalidDroppedMetricCollector) legacyregistry.CustomMustRegister(iptablesCTStateInvalidDroppedMetricCollector)
}
if localhostNodePortsAcceptedMetricsCollector != nil {
legacyregistry.CustomMustRegister(localhostNodePortsAcceptedMetricsCollector) legacyregistry.CustomMustRegister(localhostNodePortsAcceptedMetricsCollector)
}
legacyregistry.MustRegister(SyncFullProxyRulesLatency) legacyregistry.MustRegister(SyncFullProxyRulesLatency)
legacyregistry.MustRegister(SyncPartialProxyRulesLatency) legacyregistry.MustRegister(SyncPartialProxyRulesLatency)
legacyregistry.MustRegister(IPTablesRestoreFailuresTotal) legacyregistry.MustRegister(IPTablesRestoreFailuresTotal)
@@ -332,6 +336,7 @@ func newNFAcctMetricCollector(counter string, description *metrics.Desc) *nfacct
client, err := nfacct.New() client, err := nfacct.New()
if err != nil { if err != nil {
klog.ErrorS(err, "failed to initialize nfacct client") klog.ErrorS(err, "failed to initialize nfacct client")
return nil
} }
return &nfacctMetricCollector{ return &nfacctMetricCollector{
client: client, client: client,