From 73d26619f77898b97607e90efa3a6109d8f5f4b6 Mon Sep 17 00:00:00 2001
From: Michal Dulko <mdulko@redhat.com>
Date: Wed, 31 Jan 2024 07:36:32 +0100
Subject: [PATCH] Ingress: Fix listener timeout updates (#2518)

PR #2468 used an incorrect condition when updating the listener timeout
values and only updates them when listener's allowedCIDRs are updated.
This commit fixes this by making sure timeout values are checked too.
---
 pkg/ingress/controller/openstack/octavia.go | 27 ++++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkg/ingress/controller/openstack/octavia.go b/pkg/ingress/controller/openstack/octavia.go
index 1705cc36cb..7924595c07 100644
--- a/pkg/ingress/controller/openstack/octavia.go
+++ b/pkg/ingress/controller/openstack/octavia.go
@@ -365,19 +365,28 @@ func (os *OpenStack) EnsureListener(name string, lbID string, secretRefs []strin
 
 		log.WithFields(log.Fields{"lbID": lbID, "listenerName": name}).Info("listener created")
 	} else {
+		updateOpts := listeners.UpdateOpts{}
 		if len(listenerAllowedCIDRs) > 0 && !reflect.DeepEqual(listener.AllowedCIDRs, listenerAllowedCIDRs) {
-			_, err := listeners.Update(os.Octavia, listener.ID, listeners.UpdateOpts{
-				AllowedCIDRs:         &listenerAllowedCIDRs,
-				TimeoutClientData:    timeoutClientData,
-				TimeoutMemberData:    timeoutMemberData,
-				TimeoutMemberConnect: timeoutMemberConnect,
-				TimeoutTCPInspect:    timeoutTCPInspect,
-			}).Extract()
+			updateOpts.AllowedCIDRs = &listenerAllowedCIDRs
+		}
+
+		if timeoutClientData == nil && listener.TimeoutClientData != 0 || timeoutClientData != nil && *timeoutClientData != listener.TimeoutClientData ||
+			timeoutMemberData == nil && listener.TimeoutMemberData != 0 || timeoutMemberData != nil && *timeoutMemberData != listener.TimeoutMemberData ||
+			timeoutMemberConnect == nil && listener.TimeoutMemberConnect != 0 || timeoutMemberData != nil && *timeoutMemberConnect != listener.TimeoutMemberConnect ||
+			timeoutTCPInspect == nil && listener.TimeoutTCPInspect != 0 || timeoutTCPInspect != nil && *timeoutTCPInspect != listener.TimeoutTCPInspect {
+			updateOpts.TimeoutClientData = timeoutClientData
+			updateOpts.TimeoutMemberData = timeoutMemberData
+			updateOpts.TimeoutMemberConnect = timeoutMemberConnect
+			updateOpts.TimeoutTCPInspect = timeoutTCPInspect
+		}
+
+		if updateOpts != (listeners.UpdateOpts{}) {
+			_, err := listeners.Update(os.Octavia, listener.ID, updateOpts).Extract()
 			if err != nil {
-				return nil, fmt.Errorf("failed to update listener allowed CIDRs: %v", err)
+				return nil, fmt.Errorf("failed to update listener options: %v", err)
 			}
 
-			log.WithFields(log.Fields{"listenerID": listener.ID}).Debug("listener allowed CIDRs updated")
+			log.WithFields(log.Fields{"listenerID": listener.ID}).Debug("listener options updated")
 		}
 	}