BUG/MAJOR: set hard-stop-after with default value of 30m

during reorg default value was removed
haproxytech · Oct 19, 2022 · 5f282a5 · 5f282a5
1 parent 62f8c16
commit 5f282a5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/documentation/annotations.md b/documentation/annotations.md
@@ -37,7 +37,7 @@ This is autogenerated from [doc.yaml](doc.yaml). Description can be found in [ge
 | [dontlognull](#logging) | [bool](#bool) | "true" |  |:large_blue_circle:|:white_circle:|:white_circle:|
 | [src-ip-header](#src-ip-header) | string | "null" |  |:large_blue_circle:|:large_blue_circle:|:white_circle:|
 | [forwarded-for](#x-forwarded-for) | [bool](#bool) | "true" |  |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
-| [hard-stop-after](#hard-stop-after) | [time](#time) | "1h" |  |:large_blue_circle:|:white_circle:|:white_circle:|
+| [hard-stop-after](#hard-stop-after) | [time](#time) | "30m" |  |:large_blue_circle:|:white_circle:|:white_circle:|
 | [http-keep-alive](#http-options) | [bool](#bool) | "true" |  |:large_blue_circle:|:white_circle:|:white_circle:|
 | [http-server-close](#http-options) | [bool](#bool) | "false" |  |:large_blue_circle:|:white_circle:|:white_circle:|
 | [ingress.class](#ingress-class) | string |  |  |:white_circle:|:large_blue_circle:|:white_circle:|

diff --git a/documentation/doc.yaml b/documentation/doc.yaml
@@ -921,7 +921,7 @@ annotations:
     type: "[time](#time)"
     group: hard-stop-after
     dependencies: ""
-    default: "1h"
+    default: "30m"
     description:
       - Defines the maximum time allowed to perform a clean soft-stop.
     tip: []

diff --git a/pkg/haproxy/env/defaults.go b/pkg/haproxy/env/defaults.go
@@ -64,6 +64,9 @@ func SetGlobal(global *models.Global, logTargets *models.LogTargets, env Env) {
 			}
 		}
 	}
+	if global.HardStopAfter == nil {
+		global.HardStopAfter = utils.PtrInt64(1800000) // 30m
+	}
 }
 
 // SetDefaults will set default values for Defaults section config.