@@ -235,16 +235,7 @@ func (c *ServicesController) addServiceFunc(obj interface{}) {
235235 podIP := ep .Subsets [0 ].Addresses [0 ].IP
236236 // Ensure NAT mapping rules are set.
237237 c .Proxy .EnsureRules (svcIP , podIP )
238- // Apply (or remove) port filtering depending on annotation value.
239- if wholeIPPassthrough (svc ) {
240- if err := c .Proxy .DeletePortFilter (svcIP , podIP ); err != nil {
241- log .Error (err , "failed to delete port filter" , "svcIP" , svcIP , "podIP" , podIP )
242- }
243- } else {
244- if err := c .Proxy .EnsurePortFilter (svcIP , podIP , svc .Spec .Ports ); err != nil {
245- log .Error (err , "failed to ensure port filter" , "svcIP" , svcIP , "podIP" , podIP )
246- }
247- }
238+ c .reconcilePortFilter (svc , svcIP , podIP , "on svc add" )
248239 }
249240}
250241
@@ -267,9 +258,7 @@ func (c *ServicesController) deleteServiceFunc(obj interface{}) {
267258
268259 svcIP := se .Service .Status .LoadBalancer .Ingress [0 ].IP
269260 podIP := se .Endpoint .Subsets [0 ].Addresses [0 ].IP
270- if err := c .Proxy .DeletePortFilter (svcIP , podIP ); err != nil {
271- log .Error (err , "failed to delete port filter on svc deletion" , "svcIP" , svcIP , "podIP" , podIP )
272- }
261+ c .clearPortFilter (svcIP , podIP , "on svc deletion" )
273262 c .Proxy .DeleteRules (svcIP , podIP )
274263 c .Services .Delete (svc .Namespace , svc .Name )
275264}
@@ -289,9 +278,7 @@ func (c *ServicesController) updateServiceFunc(oldObj, newObj interface{}) {
289278 if hasValidServiceIP (se .Service ) && hasValidEndpointIP (se .Endpoint ) {
290279 svcIP := se .Service .Status .LoadBalancer .Ingress [0 ].IP
291280 podIP := se .Endpoint .Subsets [0 ].Addresses [0 ].IP
292- if err := c .Proxy .DeletePortFilter (svcIP , podIP ); err != nil {
293- log .Error (err , "failed to delete port filter" , "svcIP" , svcIP , "podIP" , podIP )
294- }
281+ c .clearPortFilter (svcIP , podIP , "on annotation removal" )
295282 c .Proxy .DeleteRules (svcIP , podIP )
296283 }
297284 c .Services .Delete (svc .Namespace , svc .Name )
@@ -305,9 +292,7 @@ func (c *ServicesController) updateServiceFunc(oldObj, newObj interface{}) {
305292 if hasValidServiceIP (se .Service ) && hasValidEndpointIP (se .Endpoint ) {
306293 svcIP := se .Service .Status .LoadBalancer .Ingress [0 ].IP
307294 podIP := se .Endpoint .Subsets [0 ].Addresses [0 ].IP
308- if err := c .Proxy .DeletePortFilter (svcIP , podIP ); err != nil {
309- log .Error (err , "failed to delete port filter" , "svcIP" , svcIP , "podIP" , podIP )
310- }
295+ c .clearPortFilter (svcIP , podIP , "on svc IP loss" )
311296 c .Proxy .DeleteRules (svcIP , podIP )
312297 }
313298 c .Services .Delete (svc .Namespace , svc .Name )
@@ -348,15 +333,7 @@ func (c *ServicesController) updateServiceFunc(oldObj, newObj interface{}) {
348333 svcIP := svc .Status .LoadBalancer .Ingress [0 ].IP
349334 podIP := ep .Subsets [0 ].Addresses [0 ].IP
350335 c .Proxy .EnsureRules (svcIP , podIP )
351- if wholeIPPassthrough (svc ) {
352- if err := c .Proxy .DeletePortFilter (svcIP , podIP ); err != nil {
353- log .Error (err , "failed to delete port filter" , "svcIP" , svcIP , "podIP" , podIP )
354- }
355- } else {
356- if err := c .Proxy .EnsurePortFilter (svcIP , podIP , svc .Spec .Ports ); err != nil {
357- log .Error (err , "failed to ensure port filter" , "svcIP" , svcIP , "podIP" , podIP )
358- }
359- }
336+ c .reconcilePortFilter (svc , svcIP , podIP , "on svc update" )
360337
361338 // Update or add the service mapping with the new endpoint.
362339 c .Services .Set (svc .Namespace , svc .Name , & ServiceEndpoints {Service : svc , Endpoint : ep })
@@ -386,16 +363,7 @@ func (c *ServicesController) addEndpointFunc(obj interface{}) {
386363 svcIP := se .Service .Status .LoadBalancer .Ingress [0 ].IP
387364 podIP := ep .Subsets [0 ].Addresses [0 ].IP
388365 c .Proxy .EnsureRules (svcIP , podIP )
389- // Mirror the port-filter state to the new endpoint.
390- if wholeIPPassthrough (se .Service ) {
391- if err := c .Proxy .DeletePortFilter (svcIP , podIP ); err != nil {
392- log .Error (err , "failed to delete port filter on endpoint add" , "svcIP" , svcIP , "podIP" , podIP )
393- }
394- } else {
395- if err := c .Proxy .EnsurePortFilter (svcIP , podIP , se .Service .Spec .Ports ); err != nil {
396- log .Error (err , "failed to ensure port filter on endpoint add" , "svcIP" , svcIP , "podIP" , podIP )
397- }
398- }
366+ c .reconcilePortFilter (se .Service , svcIP , podIP , "on endpoint add" )
399367 }
400368}
401369
@@ -417,9 +385,7 @@ func (c *ServicesController) deleteEndpointFunc(obj interface{}) {
417385 }
418386 svcIP := se .Service .Status .LoadBalancer .Ingress [0 ].IP
419387 podIP := se .Endpoint .Subsets [0 ].Addresses [0 ].IP
420- if err := c .Proxy .DeletePortFilter (svcIP , podIP ); err != nil {
421- log .Error (err , "failed to delete port filter on endpoint delete" , "svcIP" , svcIP , "podIP" , podIP )
422- }
388+ c .clearPortFilter (svcIP , podIP , "on endpoint delete" )
423389 c .Proxy .DeleteRules (svcIP , podIP )
424390 // Set the endpoint to nil.
425391 c .Services .SetEndpoint (ep .Namespace , ep .Name , nil )
@@ -442,9 +408,7 @@ func (c *ServicesController) updateEndpointFunc(oldObj, newObj interface{}) {
442408 if hasValidServiceIP (se .Service ) && hasValidEndpointIP (se .Endpoint ) {
443409 svcIP := se .Service .Status .LoadBalancer .Ingress [0 ].IP
444410 oldPodIP := se .Endpoint .Subsets [0 ].Addresses [0 ].IP
445- if err := c .Proxy .DeletePortFilter (svcIP , oldPodIP ); err != nil {
446- log .Error (err , "failed to delete port filter on endpoint invalidation" , "svcIP" , svcIP , "podIP" , oldPodIP )
447- }
411+ c .clearPortFilter (svcIP , oldPodIP , "on endpoint invalidation" )
448412 c .Proxy .DeleteRules (svcIP , oldPodIP )
449413 }
450414 c .Services .SetEndpoint (ep .Namespace , ep .Name , ep )
@@ -459,15 +423,7 @@ func (c *ServicesController) updateEndpointFunc(oldObj, newObj interface{}) {
459423 svcIP := se .Service .Status .LoadBalancer .Ingress [0 ].IP
460424 podIP := ep .Subsets [0 ].Addresses [0 ].IP
461425 c .Proxy .EnsureRules (svcIP , podIP )
462- if wholeIPPassthrough (se .Service ) {
463- if err := c .Proxy .DeletePortFilter (svcIP , podIP ); err != nil {
464- log .Error (err , "failed to delete port filter on endpoint update" , "svcIP" , svcIP , "podIP" , podIP )
465- }
466- } else {
467- if err := c .Proxy .EnsurePortFilter (svcIP , podIP , se .Service .Spec .Ports ); err != nil {
468- log .Error (err , "failed to ensure port filter on endpoint update" , "svcIP" , svcIP , "podIP" , podIP )
469- }
470- }
426+ c .reconcilePortFilter (se .Service , svcIP , podIP , "on endpoint update" )
471427 c .Services .SetEndpoint (ep .Namespace , ep .Name , ep )
472428}
473429
@@ -506,7 +462,10 @@ func hasValidEndpointIP(ep *v1.Endpoints) bool {
506462 return ep .Subsets [0 ].Addresses [0 ].IP != ""
507463}
508464
509- const wholeIPAnnotation = "networking.cozystack.io/wholeIP"
465+ const (
466+ wholeIPAnnotation = "networking.cozystack.io/wholeIP"
467+ allowICMPAnnotation = "networking.cozystack.io/allowICMP"
468+ )
510469
511470// hasWholeIPAnnotation reports whether the service is opted into cozy-proxy
512471// management via the wholeIP annotation. Any value triggers management — the
@@ -530,6 +489,54 @@ func wholeIPPassthrough(svc *v1.Service) bool {
530489 return svc .Annotations [wholeIPAnnotation ] != "false"
531490}
532491
492+ // allowICMP reports whether ICMP traffic should bypass the port_filter drop
493+ // rule for this service. Only meaningful in port-filter mode (wholeIP=false);
494+ // in passthrough mode the port_filter drop rule does not apply at all.
495+ func allowICMP (svc * v1.Service ) bool {
496+ if svc == nil || svc .Annotations == nil {
497+ return false
498+ }
499+ return svc .Annotations [allowICMPAnnotation ] == "true"
500+ }
501+
502+ // reconcilePortFilter applies the port-filter and ICMP-allow state implied by
503+ // the service's annotations. Call sites pass the resolved svcIP/podIP and a
504+ // short context string that ends up in error logs.
505+ func (c * ServicesController ) reconcilePortFilter (svc * v1.Service , svcIP , podIP , ctx string ) {
506+ if wholeIPPassthrough (svc ) {
507+ if err := c .Proxy .DeletePortFilter (svcIP , podIP ); err != nil {
508+ log .Error (err , "failed to delete port filter " + ctx , "svcIP" , svcIP , "podIP" , podIP )
509+ }
510+ if err := c .Proxy .DeleteICMPAllow (svcIP , podIP ); err != nil {
511+ log .Error (err , "failed to delete ICMP allow " + ctx , "svcIP" , svcIP , "podIP" , podIP )
512+ }
513+ return
514+ }
515+ if err := c .Proxy .EnsurePortFilter (svcIP , podIP , svc .Spec .Ports ); err != nil {
516+ log .Error (err , "failed to ensure port filter " + ctx , "svcIP" , svcIP , "podIP" , podIP )
517+ }
518+ if allowICMP (svc ) {
519+ if err := c .Proxy .EnsureICMPAllow (svcIP , podIP ); err != nil {
520+ log .Error (err , "failed to ensure ICMP allow " + ctx , "svcIP" , svcIP , "podIP" , podIP )
521+ }
522+ } else {
523+ if err := c .Proxy .DeleteICMPAllow (svcIP , podIP ); err != nil {
524+ log .Error (err , "failed to delete ICMP allow " + ctx , "svcIP" , svcIP , "podIP" , podIP )
525+ }
526+ }
527+ }
528+
529+ // clearPortFilter unconditionally removes both port-filter and ICMP-allow
530+ // state for (svcIP, podIP). Used by delete paths.
531+ func (c * ServicesController ) clearPortFilter (svcIP , podIP , ctx string ) {
532+ if err := c .Proxy .DeletePortFilter (svcIP , podIP ); err != nil {
533+ log .Error (err , "failed to delete port filter " + ctx , "svcIP" , svcIP , "podIP" , podIP )
534+ }
535+ if err := c .Proxy .DeleteICMPAllow (svcIP , podIP ); err != nil {
536+ log .Error (err , "failed to delete ICMP allow " + ctx , "svcIP" , svcIP , "podIP" , podIP )
537+ }
538+ }
539+
533540// cleanupRemovedServices performs an initial cleanup for removed services.
534541func (c * ServicesController ) cleanupRemovedServices () error {
535542 keepMap := make (map [string ]string )
@@ -577,5 +584,23 @@ func (c *ServicesController) cleanupRemovedServices() error {
577584 if err := c .Proxy .CleanupPortFilters (keepFilters ); err != nil {
578585 return fmt .Errorf ("failed to perform port-filter cleanup: %w" , err )
579586 }
587+ // Build ICMP-allow snapshot: services in port-filter mode that opt into
588+ // ICMP via the allowICMP annotation.
589+ keepICMP := make (map [string ]string )
590+ for _ , se := range allServices {
591+ if se .Service == nil || se .Endpoint == nil {
592+ continue
593+ }
594+ if ! hasValidServiceIP (se .Service ) || ! hasValidEndpointIP (se .Endpoint ) {
595+ continue
596+ }
597+ if wholeIPPassthrough (se .Service ) || ! allowICMP (se .Service ) {
598+ continue
599+ }
600+ keepICMP [se .Service .Status .LoadBalancer .Ingress [0 ].IP ] = se .Endpoint .Subsets [0 ].Addresses [0 ].IP
601+ }
602+ if err := c .Proxy .CleanupICMPAllow (keepICMP ); err != nil {
603+ return fmt .Errorf ("failed to perform ICMP-allow cleanup: %w" , err )
604+ }
580605 return nil
581606}
0 commit comments