From b2fb0b6d1e78bcafc9683438a2796b20c575302f Mon Sep 17 00:00:00 2001
From: ricolin <rlin@vexxhost.com>
Date: Thu, 10 Aug 2023 20:02:39 +0800
Subject: [PATCH] Use default timeout and retry for haproxy_amphora

This help to reduce unnecessary tention cause by config override in
openstack helm which sounds like overkill and could cause issues of
getting LBs with stuck operations (for updates or deletes).

Change-Id: I8024bbc169fb9e12cbf2d3df38787e2f8eed39f8
---
 octavia/Chart.yaml              | 2 +-
 octavia/values.yaml             | 4 ----
 releasenotes/notes/octavia.yaml | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/octavia/Chart.yaml b/octavia/Chart.yaml
index e153061ca6..0444b58d37 100644
--- a/octavia/Chart.yaml
+++ b/octavia/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Octavia
 name: octavia
-version: 0.2.8
+version: 0.2.9
 home: https://docs.openstack.org/octavia/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Octavia/OpenStack_Project_Octavia_vertical.png
 sources:
diff --git a/octavia/values.yaml b/octavia/values.yaml
index edbfcd0872..0f0ea75d3c 100644
--- a/octavia/values.yaml
+++ b/octavia/values.yaml
@@ -232,10 +232,6 @@ conf:
       client_cert: /etc/octavia/certs/client.pem
       base_path: /var/lib/octavia
       base_cert_dir: /var/lib/octavia/certs
-      connection_max_retries: 1500
-      connection_retry_interval: 1
-      rest_request_conn_timeout: 10
-      rest_request_read_timeout: 120
     controller_worker:
       amp_image_owner_id: null
       amp_secgroup_list: null
diff --git a/releasenotes/notes/octavia.yaml b/releasenotes/notes/octavia.yaml
index 715b2298ff..b2c9cea91b 100644
--- a/releasenotes/notes/octavia.yaml
+++ b/releasenotes/notes/octavia.yaml
@@ -12,4 +12,5 @@ octavia:
   - 0.2.6 Added OCI registry authentication
   - 0.2.7 Use HTTP probe instead of TCP probe
   - 0.2.8 Define service_type in keystone_authtoken to support application credentials with access rules
+  - 0.2.9 Use default timeout and retry configs for haproxy_amphora
 ...