From fc9b7a235d9a9a5a6fdc4235cd75e3409c60d0e8 Mon Sep 17 00:00:00 2001 From: Traky Deng Date: Wed, 29 Oct 2025 10:20:19 +0800 Subject: [PATCH 1/3] docs: correct health check unhealthy timeout description (#2625) (cherry picked from commit 1af0dc746ea8d1dcf9771f8a37c4a30a5f770dbb) --- api/v2/apisixupstream_types.go | 4 ++++ .../apisix.apache.org_apisixupstreams.yaml | 20 +++++++++++++++++++ docs/en/latest/reference/api-reference.md | 8 ++++++++ 3 files changed, 32 insertions(+) diff --git a/api/v2/apisixupstream_types.go b/api/v2/apisixupstream_types.go index 73a925be..3f48f872 100644 --- a/api/v2/apisixupstream_types.go +++ b/api/v2/apisixupstream_types.go @@ -313,11 +313,15 @@ type PassiveHealthCheckUnhealthy struct { // +kubebuilder:validation:Maximum=254 // TCPFailures define the number of TCP failures to define an unhealthy target. TCPFailures int `json:"tcpFailures,omitempty" yaml:"tcpFailures,omitempty"` +<<<<<<< HEAD // Timeout sets health check timeout in seconds. // https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196 // +======= +>>>>>>> 1af0dc74 (docs: correct health check unhealthy timeout description (#2625)) // +kubebuilder:validation:Minimum=1 // +kubebuilder:validation:Maximum=254 + // Timeout sets the number of timeouts to define an unhealthy target. Timeouts int `json:"timeout,omitempty" yaml:"timeout,omitempty"` } diff --git a/config/crd/bases/apisix.apache.org_apisixupstreams.yaml b/config/crd/bases/apisix.apache.org_apisixupstreams.yaml index fdded278..d58aec8a 100644 --- a/config/crd/bases/apisix.apache.org_apisixupstreams.yaml +++ b/config/crd/bases/apisix.apache.org_apisixupstreams.yaml @@ -190,9 +190,14 @@ spec: minimum: 0 type: integer timeout: +<<<<<<< HEAD description: |- Timeout sets health check timeout in seconds. https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196 +======= + description: Timeout sets the number of timeouts to define + an unhealthy target. +>>>>>>> 1af0dc74 (docs: correct health check unhealthy timeout description (#2625)) maximum: 254 minimum: 1 type: integer @@ -254,9 +259,14 @@ spec: minimum: 0 type: integer timeout: +<<<<<<< HEAD description: |- Timeout sets health check timeout in seconds. https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196 +======= + description: Timeout sets the number of timeouts to define + an unhealthy target. +>>>>>>> 1af0dc74 (docs: correct health check unhealthy timeout description (#2625)) maximum: 254 minimum: 1 type: integer @@ -451,9 +461,14 @@ spec: minimum: 0 type: integer timeout: +<<<<<<< HEAD description: |- Timeout sets health check timeout in seconds. https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196 +======= + description: Timeout sets the number of timeouts + to define an unhealthy target. +>>>>>>> 1af0dc74 (docs: correct health check unhealthy timeout description (#2625)) maximum: 254 minimum: 1 type: integer @@ -515,9 +530,14 @@ spec: minimum: 0 type: integer timeout: +<<<<<<< HEAD description: |- Timeout sets health check timeout in seconds. https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196 +======= + description: Timeout sets the number of timeouts + to define an unhealthy target. +>>>>>>> 1af0dc74 (docs: correct health check unhealthy timeout description (#2625)) maximum: 254 minimum: 1 type: integer diff --git a/docs/en/latest/reference/api-reference.md b/docs/en/latest/reference/api-reference.md index 7bfeb239..a9061907 100644 --- a/docs/en/latest/reference/api-reference.md +++ b/docs/en/latest/reference/api-reference.md @@ -661,7 +661,11 @@ UpstreamActiveHealthCheckHealthy defines the conditions used to actively determi | `httpCodes` _integer array_ | HTTPCodes define a list of HTTP status codes that are considered unhealthy. | | `httpFailures` _integer_ | HTTPFailures define the number of HTTP failures to define an unhealthy target. | | `tcpFailures` _integer_ | TCPFailures define the number of TCP failures to define an unhealthy target. | +<<<<<<< HEAD | `timeout` _integer_ | Timeout sets health check timeout in seconds. https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196 | +======= +| `timeout` _integer_ | Timeout sets the number of timeouts to define an unhealthy target. | +>>>>>>> 1af0dc74 (docs: correct health check unhealthy timeout description (#2625)) | `interval` _[Duration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#duration-v1-meta)_ | Interval defines the time interval for checking targets, in seconds. | @@ -1528,7 +1532,11 @@ UpstreamPassiveHealthCheckUnhealthy defines the conditions used to passively det | `httpCodes` _integer array_ | HTTPCodes define a list of HTTP status codes that are considered unhealthy. | | `httpFailures` _integer_ | HTTPFailures define the number of HTTP failures to define an unhealthy target. | | `tcpFailures` _integer_ | TCPFailures define the number of TCP failures to define an unhealthy target. | +<<<<<<< HEAD | `timeout` _integer_ | Timeout sets health check timeout in seconds. https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196 | +======= +| `timeout` _integer_ | Timeout sets the number of timeouts to define an unhealthy target. | +>>>>>>> 1af0dc74 (docs: correct health check unhealthy timeout description (#2625)) _Appears in:_ From 5a485c594c9e7e1147d737f0737a8c80a106519f Mon Sep 17 00:00:00 2001 From: traky Date: Fri, 31 Oct 2025 10:10:25 +0800 Subject: [PATCH 2/3] f --- api/v2/apisixupstream_types.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/api/v2/apisixupstream_types.go b/api/v2/apisixupstream_types.go index 3f48f872..62572a1c 100644 --- a/api/v2/apisixupstream_types.go +++ b/api/v2/apisixupstream_types.go @@ -313,12 +313,7 @@ type PassiveHealthCheckUnhealthy struct { // +kubebuilder:validation:Maximum=254 // TCPFailures define the number of TCP failures to define an unhealthy target. TCPFailures int `json:"tcpFailures,omitempty" yaml:"tcpFailures,omitempty"` -<<<<<<< HEAD // Timeout sets health check timeout in seconds. - // https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196 - // -======= ->>>>>>> 1af0dc74 (docs: correct health check unhealthy timeout description (#2625)) // +kubebuilder:validation:Minimum=1 // +kubebuilder:validation:Maximum=254 // Timeout sets the number of timeouts to define an unhealthy target. From 9fd472c3e31a657e853c0d1200f4aaec511e662a Mon Sep 17 00:00:00 2001 From: Traky Deng Date: Fri, 31 Oct 2025 10:12:21 +0800 Subject: [PATCH 3/3] Delete api/.DS_Store --- api/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 api/.DS_Store diff --git a/api/.DS_Store b/api/.DS_Store deleted file mode 100644 index 11c9f4134c0106525e6632b90ae9d1af9529462f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~u?oUK42F~1q2SWd@fIIIpWrC^1ipZS;35?SJKv-GCzr+QEJgl6@?CNbZU3Ry zh=>l)%TA;hkq&N@t%aE>@