Skip to content

OCPBUGS-126704: Restart pods when rendering egressIP settings - #3168

Open
raphaelvrosa wants to merge 1 commit into
openshift:release-4.21from
raphaelvrosa:release-4.21
Open

OCPBUGS-126704: Restart pods when rendering egressIP settings#3168
raphaelvrosa wants to merge 1 commit into
openshift:release-4.21from
raphaelvrosa:release-4.21

Conversation

@raphaelvrosa

@raphaelvrosa raphaelvrosa commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

Issue: EgressIP ReachabilityTotalTimeoutSeconds is rendered by ovnkube-config (configmap), but ovnkube node and control pods are not restarted to have the new value applied in their settings.

Solution: Make sure the spec templates of ovnkube node and control-plane pods take into account the changes in the ReachabilityTotalTimeoutSeconds setting. This is implemented by rendering the cli flags in their spec template command. When this value is changed, it then triggers the restart of those pods, reloading the parameter in their configuration.

Adds test cases to evaluate the rendering and the hash changes in ovnkube node and control pod specs.
Updates README to document that reachabilityTimeoutSeconds is enabled for runtime updates.

(cherry picked from commit 88f6a1a)

Conflicts addressed:

diff --cc bindata/network/ovn-kubernetes/common/008-script-lib.yaml
index 4a53f4de7,b4c8b1840..000000000
--- a/bindata/network/ovn-kubernetes/common/008-script-lib.yaml
+++ b/bindata/network/ovn-kubernetes/common/008-script-lib.yaml
@@@ -538,16 -569,13 +538,24 @@@ data
  
        echo "I$(date "+%m%d %H:%M:%S.%N") - starting ovnkube-node"
  
++<<<<<<< HEAD
 +      # enable egress ip, egress firewall, egress qos, egress service
 +      egress_features_enable_flag="--enable-egress-ip=true --enable-egress-firewall=true --enable-egress-qos=true --enable-egress-service=true"
++=======
+       ovn_eip_reachability_timeout_opt=
+       {{- if .ReachabilityTotalTimeoutSeconds }}        
+         ovn_eip_reachability_timeout_opt="--egressip-reachability-total-timeout {{.ReachabilityTotalTimeoutSeconds}}"
+       {{ end }}
+ 
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
        init_ovnkube_controller="--init-ovnkube-controller ${K8S_NODE}"
 -      gateway_interface="br-ex"
 +      multi_external_gateway_enable_flag="--enable-multi-external-gateway=true"
 +      gateway_interface=br-ex
 +
 +      # enable multicast
 +      enable_multicast_flag="--enable-multicast"
 +
 +      # Use OVN_NODE_MODE environment variable, default to "full" if not set
        OVN_NODE_MODE=${OVN_NODE_MODE:-full}
        # We check only dpu-host mode and not smart-nic mode here as currently we do not support it yet
        # Once we support it, we will need to check for it here and add relevant code.
@@@ -757,6 -752,5 +765,10 @@@
          ${ovn_v6_masquerade_subnet_opt} \
          ${ovn_v4_transit_switch_subnet_opt} \
          ${ovn_v6_transit_switch_subnet_opt} \
++<<<<<<< HEAD
 +        ${egress_features_enable_flag} \
 +        ${multi_external_gateway_enable_flag}
++=======
+         ${ovn_eip_reachability_timeout_opt}
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
      }
diff --cc bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml
index c9225ec98,2bf64ccc5..000000000
--- a/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml
+++ b/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml
@@@ -238,20 -223,12 +243,25 @@@ spec
              ${ovn_v6_join_subnet_opt} \
              ${ovn_v4_transit_switch_subnet_opt} \
              ${ovn_v6_transit_switch_subnet_opt} \
 -            ${ovn_v4_masquerade_subnet_opt} \
 -            ${ovn_v6_masquerade_subnet_opt} \
 +            ${dns_name_resolver_enabled_flag} \
              ${persistent_ips_enabled_flag} \
 +            ${multi_network_enabled_flag} \
 +            ${network_segmentation_enabled_flag} \
              ${route_advertisements_enable_flag} \
++<<<<<<< HEAD
 +            ${preconfigured_udn_addresses_enable_flag} \
 +            --enable-egress-ip=true \
 +            --enable-egress-firewall=true \
 +            --enable-egress-qos=true \
 +            --enable-egress-service=true \
 +            --enable-multicast \
 +            --enable-multi-external-gateway=true \
 +            ${multi_network_policy_enabled_flag} \
 +            ${admin_network_policy_enabled_flag}
++=======
+             ${evpn_enable_flag} \
+             ${ovn_eip_reachability_timeout_opt}
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
          volumeMounts:
          - mountPath: /run/ovnkube-config/
            name: ovnkube-config
diff --cc bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
index 717c3e687,23e3b1c58..000000000
--- a/bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
+++ b/bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
@@@ -36,10 -36,10 +36,17 @@@ data
      dns-service-name="dns-default"
   
      [ovnkubernetesfeature]
++<<<<<<< HEAD
 +
 +    {{- if .ReachabilityTotalTimeoutSeconds }}
 +    egressip-reachability-total-timeout={{.ReachabilityTotalTimeoutSeconds}}
 +    {{- end }}
++=======
+     enable-egress-ip=true
+     enable-egress-firewall=true
+     enable-egress-qos=true
+     enable-egress-service=true
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
  {{- if .ReachabilityNodePort }}
      egressip-node-healthcheck-port={{.ReachabilityNodePort}}
  {{- end }}
diff --cc bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml
index d914c3c2c,2f69ef19e..000000000
--- a/bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml
+++ b/bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml
@@@ -195,21 -176,13 +200,26 @@@ spec
              ${ovn_v6_join_subnet_opt} \
              ${ovn_v4_transit_switch_subnet_opt} \
              ${ovn_v6_transit_switch_subnet_opt} \
 -            ${ovn_v4_masquerade_subnet_opt} \
 -            ${ovn_v6_masquerade_subnet_opt} \
 +            ${dns_name_resolver_enabled_flag} \
              ${persistent_ips_enabled_flag} \
 +            ${multi_network_enabled_flag} \
 +            ${network_segmentation_enabled_flag} \
              ${gateway_mode_flags} \
              ${route_advertisements_enable_flag} \
++<<<<<<< HEAD
 +            ${preconfigured_udn_addresses_enable_flag} \
 +            --enable-egress-ip=true \
 +            --enable-egress-firewall=true \
 +            --enable-egress-qos=true \
 +            --enable-egress-service=true \
 +            --enable-multicast \
 +            --enable-multi-external-gateway=true \
 +            ${multi_network_policy_enabled_flag} \
 +            ${admin_network_policy_enabled_flag}
++=======
+             ${evpn_enable_flag} \
+             ${ovn_eip_reachability_timeout_opt}
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
          volumeMounts:
          - mountPath: /run/ovnkube-config/
            name: ovnkube-config
diff --cc pkg/network/ovn_kubernetes_test.go
index 7300323ff,91c6a5eb0..000000000
--- a/pkg/network/ovn_kubernetes_test.go
+++ b/pkg/network/ovn_kubernetes_test.go
@@@ -384,8 -401,16 +384,15 @@@ dns-service-namespace="openshift-dns
  dns-service-name="dns-default"
  
  [ovnkubernetesfeature]
++<<<<<<< HEAD
 +egressip-reachability-total-timeout=3
++=======
+ enable-egress-ip=true
+ enable-egress-firewall=true
+ enable-egress-qos=true
+ enable-egress-service=true
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
  egressip-node-healthcheck-port=9107
 -enable-multi-network=true
 -enable-network-segmentation=true
 -enable-preconfigured-udn-addresses=true
 -enable-admin-network-policy=true
 -enable-multi-external-gateway=true
  
  [gateway]
  mode=local
@@@ -437,8 -462,16 +444,15 @@@ dns-service-namespace="openshift-dns
  dns-service-name="dns-default"
  
  [ovnkubernetesfeature]
++<<<<<<< HEAD
 +egressip-reachability-total-timeout=0
++=======
+ enable-egress-ip=true
+ enable-egress-firewall=true
+ enable-egress-qos=true
+ enable-egress-service=true
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
  egressip-node-healthcheck-port=9107
 -enable-multi-network=true
 -enable-network-segmentation=true
 -enable-preconfigured-udn-addresses=true
 -enable-admin-network-policy=true
 -enable-multi-external-gateway=true
  
  [gateway]
  mode=local

@raphaelvrosa
OCPBUGS-62144: Restart pods when rendering egressIP settings
4865c61 
Issue: EgressIP ReachabilityTotalTimeoutSeconds is rendered by
ovnkube-config (configmap), but ovnkube node and control pods
are not restarted to have the new value applied in their settings.

Solution: Make sure the spec templates of ovnkube node and control-plane
pods take into account the changes in the ReachabilityTotalTimeoutSeconds
setting. This is implemented by rendering the cli flags in their spec
template command. When this value is changed, it then triggers the
restart of those pods, reloading the parameter in their configuration.

Adds test cases to evaluate the rendering and the hash changes in
ovnkube node and control pod specs.
Updates README to document that reachabilityTimeoutSeconds
is enabled for runtime updates.

Signed-off-by: Raphael Rosa <raprosa@redhat.com>
(cherry picked from commit 88f6a1a)
@openshift-merge-bot

openshift-merge-bot Bot commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 18, 2026
@openshift-ci-robot

openshift-ci-robot commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

@raphaelvrosa: This pull request explicitly references no jira issue.

Details

In response to this:

Issue: EgressIP ReachabilityTotalTimeoutSeconds is rendered by ovnkube-config (configmap), but ovnkube node and control pods are not restarted to have the new value applied in their settings.

Solution: Make sure the spec templates of ovnkube node and control-plane pods take into account the changes in the ReachabilityTotalTimeoutSeconds setting. This is implemented by rendering the cli flags in their spec template command. When this value is changed, it then triggers the restart of those pods, reloading the parameter in their configuration.

Adds test cases to evaluate the rendering and the hash changes in ovnkube node and control pod specs.
Updates README to document that reachabilityTimeoutSeconds is enabled for runtime updates.

(cherry picked from commit 88f6a1a)

Conflicts addressed:

diff --cc bindata/network/ovn-kubernetes/common/008-script-lib.yaml
index 4a53f4de7,b4c8b1840..000000000
--- a/bindata/network/ovn-kubernetes/common/008-script-lib.yaml
+++ b/bindata/network/ovn-kubernetes/common/008-script-lib.yaml
@@@ -538,16 -569,13 +538,24 @@@ data
 
       echo "I$(date "+%m%d %H:%M:%S.%N") - starting ovnkube-node"
 
++<<<<<<< HEAD
+      # enable egress ip, egress firewall, egress qos, egress service
+      egress_features_enable_flag="--enable-egress-ip=true --enable-egress-firewall=true --enable-egress-qos=true --enable-egress-service=true"
++=======
+       ovn_eip_reachability_timeout_opt=
+       {{- if .ReachabilityTotalTimeoutSeconds }}        
+         ovn_eip_reachability_timeout_opt="--egressip-reachability-total-timeout {{.ReachabilityTotalTimeoutSeconds}}"
+       {{ end }}
+ 
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
       init_ovnkube_controller="--init-ovnkube-controller ${K8S_NODE}"
-      gateway_interface="br-ex"
+      multi_external_gateway_enable_flag="--enable-multi-external-gateway=true"
+      gateway_interface=br-ex
+
+      # enable multicast
+      enable_multicast_flag="--enable-multicast"
+
+      # Use OVN_NODE_MODE environment variable, default to "full" if not set
       OVN_NODE_MODE=${OVN_NODE_MODE:-full}
       # We check only dpu-host mode and not smart-nic mode here as currently we do not support it yet
       # Once we support it, we will need to check for it here and add relevant code.
@@@ -757,6 -752,5 +765,10 @@@
         ${ovn_v6_masquerade_subnet_opt} \
         ${ovn_v4_transit_switch_subnet_opt} \
         ${ovn_v6_transit_switch_subnet_opt} \
++<<<<<<< HEAD
+        ${egress_features_enable_flag} \
+        ${multi_external_gateway_enable_flag}
++=======
+         ${ovn_eip_reachability_timeout_opt}
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
     }
diff --cc bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml
index c9225ec98,2bf64ccc5..000000000
--- a/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml
+++ b/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml
@@@ -238,20 -223,12 +243,25 @@@ spec
             ${ovn_v6_join_subnet_opt} \
             ${ovn_v4_transit_switch_subnet_opt} \
             ${ovn_v6_transit_switch_subnet_opt} \
-            ${ovn_v4_masquerade_subnet_opt} \
-            ${ovn_v6_masquerade_subnet_opt} \
+            ${dns_name_resolver_enabled_flag} \
             ${persistent_ips_enabled_flag} \
+            ${multi_network_enabled_flag} \
+            ${network_segmentation_enabled_flag} \
             ${route_advertisements_enable_flag} \
++<<<<<<< HEAD
+            ${preconfigured_udn_addresses_enable_flag} \
+            --enable-egress-ip=true \
+            --enable-egress-firewall=true \
+            --enable-egress-qos=true \
+            --enable-egress-service=true \
+            --enable-multicast \
+            --enable-multi-external-gateway=true \
+            ${multi_network_policy_enabled_flag} \
+            ${admin_network_policy_enabled_flag}
++=======
+             ${evpn_enable_flag} \
+             ${ovn_eip_reachability_timeout_opt}
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
         volumeMounts:
         - mountPath: /run/ovnkube-config/
           name: ovnkube-config
diff --cc bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
index 717c3e687,23e3b1c58..000000000
--- a/bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
+++ b/bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
@@@ -36,10 -36,10 +36,17 @@@ data
     dns-service-name="dns-default"
  
     [ovnkubernetesfeature]
++<<<<<<< HEAD
+
+    {{- if .ReachabilityTotalTimeoutSeconds }}
+    egressip-reachability-total-timeout={{.ReachabilityTotalTimeoutSeconds}}
+    {{- end }}
++=======
+     enable-egress-ip=true
+     enable-egress-firewall=true
+     enable-egress-qos=true
+     enable-egress-service=true
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
 {{- if .ReachabilityNodePort }}
     egressip-node-healthcheck-port={{.ReachabilityNodePort}}
 {{- end }}
diff --cc bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml
index d914c3c2c,2f69ef19e..000000000
--- a/bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml
+++ b/bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml
@@@ -195,21 -176,13 +200,26 @@@ spec
             ${ovn_v6_join_subnet_opt} \
             ${ovn_v4_transit_switch_subnet_opt} \
             ${ovn_v6_transit_switch_subnet_opt} \
-            ${ovn_v4_masquerade_subnet_opt} \
-            ${ovn_v6_masquerade_subnet_opt} \
+            ${dns_name_resolver_enabled_flag} \
             ${persistent_ips_enabled_flag} \
+            ${multi_network_enabled_flag} \
+            ${network_segmentation_enabled_flag} \
             ${gateway_mode_flags} \
             ${route_advertisements_enable_flag} \
++<<<<<<< HEAD
+            ${preconfigured_udn_addresses_enable_flag} \
+            --enable-egress-ip=true \
+            --enable-egress-firewall=true \
+            --enable-egress-qos=true \
+            --enable-egress-service=true \
+            --enable-multicast \
+            --enable-multi-external-gateway=true \
+            ${multi_network_policy_enabled_flag} \
+            ${admin_network_policy_enabled_flag}
++=======
+             ${evpn_enable_flag} \
+             ${ovn_eip_reachability_timeout_opt}
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
         volumeMounts:
         - mountPath: /run/ovnkube-config/
           name: ovnkube-config
diff --cc pkg/network/ovn_kubernetes_test.go
index 7300323ff,91c6a5eb0..000000000
--- a/pkg/network/ovn_kubernetes_test.go
+++ b/pkg/network/ovn_kubernetes_test.go
@@@ -384,8 -401,16 +384,15 @@@ dns-service-namespace="openshift-dns
 dns-service-name="dns-default"
 
 [ovnkubernetesfeature]
++<<<<<<< HEAD
+egressip-reachability-total-timeout=3
++=======
+ enable-egress-ip=true
+ enable-egress-firewall=true
+ enable-egress-qos=true
+ enable-egress-service=true
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
 egressip-node-healthcheck-port=9107
-enable-multi-network=true
-enable-network-segmentation=true
-enable-preconfigured-udn-addresses=true
-enable-admin-network-policy=true
-enable-multi-external-gateway=true
 
 [gateway]
 mode=local
@@@ -437,8 -462,16 +444,15 @@@ dns-service-namespace="openshift-dns
 dns-service-name="dns-default"
 
 [ovnkubernetesfeature]
++<<<<<<< HEAD
+egressip-reachability-total-timeout=0
++=======
+ enable-egress-ip=true
+ enable-egress-firewall=true
+ enable-egress-qos=true
+ enable-egress-service=true
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
 egressip-node-healthcheck-port=9107
-enable-multi-network=true
-enable-network-segmentation=true
-enable-preconfigured-udn-addresses=true
-enable-admin-network-policy=true
-enable-multi-external-gateway=true
 
 [gateway]
 mode=local

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Sep 18, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: ab4d291f-78ce-4dcc-8661-d5ad1abca77b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Comment @coderabbitai help to get the list of available commands.

@raphaelvrosa

raphaelvrosa commented Sep 18, 2026

Copy link
Copy Markdown
Contributor Author

/pipeline required

@kyrtapz can you take a look?

@openshift-merge-bot

openshift-merge-bot Bot commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test 4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade
/test 4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade
/test 4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-upgrade
/test e2e-aws-ovn-hypershift-conformance
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-aws-ovn-upgrade
/test e2e-aws-ovn-upgrade-ipsec
/test e2e-aws-ovn-windows
/test e2e-azure-ovn-upgrade
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-dualstack-bgp
/test e2e-metal-ipi-ovn-dualstack-bgp-local-gw
/test e2e-metal-ipi-ovn-ipv6
/test e2e-metal-ipi-ovn-ipv6-ipsec
/test e2e-ovn-ipsec-step-registry
/test hypershift-e2e-aks

@raphaelvrosa

raphaelvrosa commented Sep 18, 2026

Copy link
Copy Markdown
Contributor Author

/jira cherry-pick OCPBUGS-99048

@openshift-ci-robot

openshift-ci-robot commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

@raphaelvrosa: Jira Issue OCPBUGS-99048 has been cloned as Jira Issue OCPBUGS-126704. Will retitle bug to link to clone.
/retitle OCPBUGS-126704: NO-JIRA: Restart pods when rendering egressIP settings

Details

In response to this:

/jira cherry-pick OCPBUGS-99048

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot changed the title NO-JIRA: Restart pods when rendering egressIP settings OCPBUGS-126704: NO-JIRA: Restart pods when rendering egressIP settings Sep 18, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Sep 18, 2026
@openshift-ci-robot

openshift-ci-robot commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

@raphaelvrosa: This pull request references Jira Issue OCPBUGS-126704, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.z) matches configured target version for branch (4.21.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-99048 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-99048 targets the "4.22.z" version, which is one of the valid target versions: 4.22.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (core-networking-bot@redhat.com), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Issue: EgressIP ReachabilityTotalTimeoutSeconds is rendered by ovnkube-config (configmap), but ovnkube node and control pods are not restarted to have the new value applied in their settings.

Solution: Make sure the spec templates of ovnkube node and control-plane pods take into account the changes in the ReachabilityTotalTimeoutSeconds setting. This is implemented by rendering the cli flags in their spec template command. When this value is changed, it then triggers the restart of those pods, reloading the parameter in their configuration.

Adds test cases to evaluate the rendering and the hash changes in ovnkube node and control pod specs.
Updates README to document that reachabilityTimeoutSeconds is enabled for runtime updates.

(cherry picked from commit 88f6a1a)

Conflicts addressed:

diff --cc bindata/network/ovn-kubernetes/common/008-script-lib.yaml
index 4a53f4de7,b4c8b1840..000000000
--- a/bindata/network/ovn-kubernetes/common/008-script-lib.yaml
+++ b/bindata/network/ovn-kubernetes/common/008-script-lib.yaml
@@@ -538,16 -569,13 +538,24 @@@ data
 
       echo "I$(date "+%m%d %H:%M:%S.%N") - starting ovnkube-node"
 
++<<<<<<< HEAD
+      # enable egress ip, egress firewall, egress qos, egress service
+      egress_features_enable_flag="--enable-egress-ip=true --enable-egress-firewall=true --enable-egress-qos=true --enable-egress-service=true"
++=======
+       ovn_eip_reachability_timeout_opt=
+       {{- if .ReachabilityTotalTimeoutSeconds }}        
+         ovn_eip_reachability_timeout_opt="--egressip-reachability-total-timeout {{.ReachabilityTotalTimeoutSeconds}}"
+       {{ end }}
+ 
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
       init_ovnkube_controller="--init-ovnkube-controller ${K8S_NODE}"
-      gateway_interface="br-ex"
+      multi_external_gateway_enable_flag="--enable-multi-external-gateway=true"
+      gateway_interface=br-ex
+
+      # enable multicast
+      enable_multicast_flag="--enable-multicast"
+
+      # Use OVN_NODE_MODE environment variable, default to "full" if not set
       OVN_NODE_MODE=${OVN_NODE_MODE:-full}
       # We check only dpu-host mode and not smart-nic mode here as currently we do not support it yet
       # Once we support it, we will need to check for it here and add relevant code.
@@@ -757,6 -752,5 +765,10 @@@
         ${ovn_v6_masquerade_subnet_opt} \
         ${ovn_v4_transit_switch_subnet_opt} \
         ${ovn_v6_transit_switch_subnet_opt} \
++<<<<<<< HEAD
+        ${egress_features_enable_flag} \
+        ${multi_external_gateway_enable_flag}
++=======
+         ${ovn_eip_reachability_timeout_opt}
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
     }
diff --cc bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml
index c9225ec98,2bf64ccc5..000000000
--- a/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml
+++ b/bindata/network/ovn-kubernetes/managed/ovnkube-control-plane.yaml
@@@ -238,20 -223,12 +243,25 @@@ spec
             ${ovn_v6_join_subnet_opt} \
             ${ovn_v4_transit_switch_subnet_opt} \
             ${ovn_v6_transit_switch_subnet_opt} \
-            ${ovn_v4_masquerade_subnet_opt} \
-            ${ovn_v6_masquerade_subnet_opt} \
+            ${dns_name_resolver_enabled_flag} \
             ${persistent_ips_enabled_flag} \
+            ${multi_network_enabled_flag} \
+            ${network_segmentation_enabled_flag} \
             ${route_advertisements_enable_flag} \
++<<<<<<< HEAD
+            ${preconfigured_udn_addresses_enable_flag} \
+            --enable-egress-ip=true \
+            --enable-egress-firewall=true \
+            --enable-egress-qos=true \
+            --enable-egress-service=true \
+            --enable-multicast \
+            --enable-multi-external-gateway=true \
+            ${multi_network_policy_enabled_flag} \
+            ${admin_network_policy_enabled_flag}
++=======
+             ${evpn_enable_flag} \
+             ${ovn_eip_reachability_timeout_opt}
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
         volumeMounts:
         - mountPath: /run/ovnkube-config/
           name: ovnkube-config
diff --cc bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
index 717c3e687,23e3b1c58..000000000
--- a/bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
+++ b/bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
@@@ -36,10 -36,10 +36,17 @@@ data
     dns-service-name="dns-default"
  
     [ovnkubernetesfeature]
++<<<<<<< HEAD
+
+    {{- if .ReachabilityTotalTimeoutSeconds }}
+    egressip-reachability-total-timeout={{.ReachabilityTotalTimeoutSeconds}}
+    {{- end }}
++=======
+     enable-egress-ip=true
+     enable-egress-firewall=true
+     enable-egress-qos=true
+     enable-egress-service=true
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
 {{- if .ReachabilityNodePort }}
     egressip-node-healthcheck-port={{.ReachabilityNodePort}}
 {{- end }}
diff --cc bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml
index d914c3c2c,2f69ef19e..000000000
--- a/bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml
+++ b/bindata/network/ovn-kubernetes/self-hosted/ovnkube-control-plane.yaml
@@@ -195,21 -176,13 +200,26 @@@ spec
             ${ovn_v6_join_subnet_opt} \
             ${ovn_v4_transit_switch_subnet_opt} \
             ${ovn_v6_transit_switch_subnet_opt} \
-            ${ovn_v4_masquerade_subnet_opt} \
-            ${ovn_v6_masquerade_subnet_opt} \
+            ${dns_name_resolver_enabled_flag} \
             ${persistent_ips_enabled_flag} \
+            ${multi_network_enabled_flag} \
+            ${network_segmentation_enabled_flag} \
             ${gateway_mode_flags} \
             ${route_advertisements_enable_flag} \
++<<<<<<< HEAD
+            ${preconfigured_udn_addresses_enable_flag} \
+            --enable-egress-ip=true \
+            --enable-egress-firewall=true \
+            --enable-egress-qos=true \
+            --enable-egress-service=true \
+            --enable-multicast \
+            --enable-multi-external-gateway=true \
+            ${multi_network_policy_enabled_flag} \
+            ${admin_network_policy_enabled_flag}
++=======
+             ${evpn_enable_flag} \
+             ${ovn_eip_reachability_timeout_opt}
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
         volumeMounts:
         - mountPath: /run/ovnkube-config/
           name: ovnkube-config
diff --cc pkg/network/ovn_kubernetes_test.go
index 7300323ff,91c6a5eb0..000000000
--- a/pkg/network/ovn_kubernetes_test.go
+++ b/pkg/network/ovn_kubernetes_test.go
@@@ -384,8 -401,16 +384,15 @@@ dns-service-namespace="openshift-dns
 dns-service-name="dns-default"
 
 [ovnkubernetesfeature]
++<<<<<<< HEAD
+egressip-reachability-total-timeout=3
++=======
+ enable-egress-ip=true
+ enable-egress-firewall=true
+ enable-egress-qos=true
+ enable-egress-service=true
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
 egressip-node-healthcheck-port=9107
-enable-multi-network=true
-enable-network-segmentation=true
-enable-preconfigured-udn-addresses=true
-enable-admin-network-policy=true
-enable-multi-external-gateway=true
 
 [gateway]
 mode=local
@@@ -437,8 -462,16 +444,15 @@@ dns-service-namespace="openshift-dns
 dns-service-name="dns-default"
 
 [ovnkubernetesfeature]
++<<<<<<< HEAD
+egressip-reachability-total-timeout=0
++=======
+ enable-egress-ip=true
+ enable-egress-firewall=true
+ enable-egress-qos=true
+ enable-egress-service=true
++>>>>>>> 88f6a1a39 (OCPBUGS-62144: Restart pods when rendering egressIP settings)
 egressip-node-healthcheck-port=9107
-enable-multi-network=true
-enable-network-segmentation=true
-enable-preconfigured-udn-addresses=true
-enable-admin-network-policy=true
-enable-multi-external-gateway=true
 
 [gateway]
 mode=local

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@kyrtapz

kyrtapz commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

@raphaelvrosa once a hypershift job completes please go through the artifacts to verify that the flag is being set.

@kyrtapz

kyrtapz commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 18, 2026
@openshift-ci

openshift-ci Bot commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kyrtapz, raphaelvrosa

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 18, 2026
@kyrtapz

kyrtapz commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Sep 18, 2026
@raphaelvrosa

raphaelvrosa commented Sep 22, 2026

Copy link
Copy Markdown
Contributor Author

/retest required

@raphaelvrosa

raphaelvrosa commented Sep 22, 2026

Copy link
Copy Markdown
Contributor Author

/retest-required

@raphaelvrosa

raphaelvrosa commented Sep 22, 2026

Copy link
Copy Markdown
Contributor Author

@raphaelvrosa once a hypershift job completes please go through the artifacts to verify that the flag is being set.

@kyrtapz the default values are set in ovnkube-node and ovn-cluster-manager pods. Any specific tests to look into hypershift?

@raphaelvrosa raphaelvrosa changed the title OCPBUGS-126704: NO-JIRA: Restart pods when rendering egressIP settings OCPBUGS-126704: Restart pods when rendering egressIP settings Sep 22, 2026
@openshift-ci

openshift-ci Bot commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

@raphaelvrosa: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade 4865c61 link false /test 4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade
ci/prow/e2e-metal-ipi-ovn-secondary-encap 4865c61 link false /test e2e-metal-ipi-ovn-secondary-encap
ci/prow/security 4865c61 link false /test security
ci/prow/4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-upgrade 4865c61 link false /test 4.21-upgrade-from-stable-4.20-e2e-gcp-ovn-upgrade
ci/prow/4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade 4865c61 link false /test 4.21-upgrade-from-stable-4.20-e2e-azure-ovn-upgrade
ci/prow/e2e-gcp-ovn 4865c61 link true /test e2e-gcp-ovn
ci/prow/e2e-aws-ovn-upgrade 4865c61 link true /test e2e-aws-ovn-upgrade
ci/prow/e2e-azure-ovn-upgrade 4865c61 link true /test e2e-azure-ovn-upgrade

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bpickard22 bpickard22 Awaiting requested review from bpickard22
@kyrtapz kyrtapz Awaiting requested review from kyrtapz

Assignees

@kyrtapz kyrtapz

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@raphaelvrosa @openshift-ci-robot @kyrtapz