From e930ddcce772350626349f7cc39a2366cbfd1f45 Mon Sep 17 00:00:00 2001 From: Puneet Dixit <236133619+puneetdixit200@users.noreply.github.com> Date: Wed, 20 May 2026 21:41:05 +0530 Subject: [PATCH 1/2] docs: clarify Helm timeout behavior Assisted-by: OpenAI Codex Signed-off-by: Puneet Dixit <236133619+puneetdixit200@users.noreply.github.com> --- charts/fleet-crd/templates/crds.yaml | 34 +++++++++++++------ .../v1alpha1/bundledeployment_types.go | 4 ++- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/charts/fleet-crd/templates/crds.yaml b/charts/fleet-crd/templates/crds.yaml index f411f5c4b4..dd23647b23 100644 --- a/charts/fleet-crd/templates/crds.yaml +++ b/charts/fleet-crd/templates/crds.yaml @@ -505,8 +505,10 @@ spec: nullable: true type: object timeoutSeconds: - description: TimeoutSeconds is the time to wait for Helm - operations. + description: TimeoutSeconds is the number of seconds Fleet + passes to Helm operations. Omitted or zero values disable + Helm status waiting; positive values enable Helm status + waiting up to the configured timeout. type: integer values: description: 'Values passed to Helm. It is possible to specify @@ -971,8 +973,10 @@ spec: nullable: true type: object timeoutSeconds: - description: TimeoutSeconds is the time to wait for Helm - operations. + description: TimeoutSeconds is the number of seconds Fleet + passes to Helm operations. Omitted or zero values disable + Helm status waiting; positive values enable Helm status + waiting up to the configured timeout. type: integer values: description: 'Values passed to Helm. It is possible to specify @@ -2010,7 +2014,10 @@ spec: nullable: true type: object timeoutSeconds: - description: TimeoutSeconds is the time to wait for Helm operations. + description: TimeoutSeconds is the number of seconds Fleet + passes to Helm operations. Omitted or zero values disable + Helm status waiting; positive values enable Helm status waiting + up to the configured timeout. type: integer values: description: 'Values passed to Helm. It is possible to specify @@ -3036,8 +3043,10 @@ spec: nullable: true type: object timeoutSeconds: - description: TimeoutSeconds is the time to wait for Helm - operations. + description: TimeoutSeconds is the number of seconds Fleet + passes to Helm operations. Omitted or zero values disable + Helm status waiting; positive values enable Helm status + waiting up to the configured timeout. type: integer values: description: 'Values passed to Helm. It is possible to @@ -8233,7 +8242,10 @@ spec: nullable: true type: object timeoutSeconds: - description: TimeoutSeconds is the time to wait for Helm operations. + description: TimeoutSeconds is the number of seconds Fleet + passes to Helm operations. Omitted or zero values disable + Helm status waiting; positive values enable Helm status waiting + up to the configured timeout. type: integer values: description: 'Values passed to Helm. It is possible to specify @@ -9283,8 +9295,10 @@ spec: nullable: true type: object timeoutSeconds: - description: TimeoutSeconds is the time to wait for Helm - operations. + description: TimeoutSeconds is the number of seconds Fleet + passes to Helm operations. Omitted or zero values disable + Helm status waiting; positive values enable Helm status + waiting up to the configured timeout. type: integer values: description: 'Values passed to Helm. It is possible to diff --git a/pkg/apis/fleet.cattle.io/v1alpha1/bundledeployment_types.go b/pkg/apis/fleet.cattle.io/v1alpha1/bundledeployment_types.go index 6b8042a1ac..0d22bd5a71 100644 --- a/pkg/apis/fleet.cattle.io/v1alpha1/bundledeployment_types.go +++ b/pkg/apis/fleet.cattle.io/v1alpha1/bundledeployment_types.go @@ -234,7 +234,9 @@ type HelmOptions struct { // Version of the chart to download Version string `json:"version,omitempty"` - // TimeoutSeconds is the time to wait for Helm operations. + // TimeoutSeconds is the number of seconds Fleet passes to Helm operations. + // Omitted or zero values disable Helm status waiting; positive values enable + // Helm status waiting up to the configured timeout. TimeoutSeconds int `json:"timeoutSeconds,omitempty"` // Values passed to Helm. It is possible to specify the keys and values From dd49094113775b98f488b9762c3e471c9679613b Mon Sep 17 00:00:00 2001 From: Puneet Dixit <236133619+puneetdixit200@users.noreply.github.com> Date: Sat, 23 May 2026 21:18:45 +0530 Subject: [PATCH 2/2] docs: clarify helm timeout wait scope --- charts/fleet-crd/templates/crds.yaml | 42 +++++++++++-------- .../v1alpha1/bundledeployment_types.go | 5 ++- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/charts/fleet-crd/templates/crds.yaml b/charts/fleet-crd/templates/crds.yaml index dd23647b23..85b1ed3f41 100644 --- a/charts/fleet-crd/templates/crds.yaml +++ b/charts/fleet-crd/templates/crds.yaml @@ -506,9 +506,10 @@ spec: type: object timeoutSeconds: description: TimeoutSeconds is the number of seconds Fleet - passes to Helm operations. Omitted or zero values disable - Helm status waiting; positive values enable Helm status - waiting up to the configured timeout. + passes to Helm operations. Omitted or zero values use hook-only + waiting. Positive values enable Helm status waiting during + install and upgrade operations up to the configured timeout; + uninstall and rollback operations keep hook-only waiting. type: integer values: description: 'Values passed to Helm. It is possible to specify @@ -974,9 +975,10 @@ spec: type: object timeoutSeconds: description: TimeoutSeconds is the number of seconds Fleet - passes to Helm operations. Omitted or zero values disable - Helm status waiting; positive values enable Helm status - waiting up to the configured timeout. + passes to Helm operations. Omitted or zero values use hook-only + waiting. Positive values enable Helm status waiting during + install and upgrade operations up to the configured timeout; + uninstall and rollback operations keep hook-only waiting. type: integer values: description: 'Values passed to Helm. It is possible to specify @@ -2015,9 +2017,10 @@ spec: type: object timeoutSeconds: description: TimeoutSeconds is the number of seconds Fleet - passes to Helm operations. Omitted or zero values disable - Helm status waiting; positive values enable Helm status waiting - up to the configured timeout. + passes to Helm operations. Omitted or zero values use hook-only + waiting. Positive values enable Helm status waiting during install + and upgrade operations up to the configured timeout; uninstall + and rollback operations keep hook-only waiting. type: integer values: description: 'Values passed to Helm. It is possible to specify @@ -3044,9 +3047,10 @@ spec: type: object timeoutSeconds: description: TimeoutSeconds is the number of seconds Fleet - passes to Helm operations. Omitted or zero values disable - Helm status waiting; positive values enable Helm status - waiting up to the configured timeout. + passes to Helm operations. Omitted or zero values use hook-only + waiting. Positive values enable Helm status waiting during + install and upgrade operations up to the configured timeout; + uninstall and rollback operations keep hook-only waiting. type: integer values: description: 'Values passed to Helm. It is possible to @@ -8243,9 +8247,10 @@ spec: type: object timeoutSeconds: description: TimeoutSeconds is the number of seconds Fleet - passes to Helm operations. Omitted or zero values disable - Helm status waiting; positive values enable Helm status waiting - up to the configured timeout. + passes to Helm operations. Omitted or zero values use hook-only + waiting. Positive values enable Helm status waiting during install + and upgrade operations up to the configured timeout; uninstall + and rollback operations keep hook-only waiting. type: integer values: description: 'Values passed to Helm. It is possible to specify @@ -9296,9 +9301,10 @@ spec: type: object timeoutSeconds: description: TimeoutSeconds is the number of seconds Fleet - passes to Helm operations. Omitted or zero values disable - Helm status waiting; positive values enable Helm status - waiting up to the configured timeout. + passes to Helm operations. Omitted or zero values use hook-only + waiting. Positive values enable Helm status waiting during + install and upgrade operations up to the configured timeout; + uninstall and rollback operations keep hook-only waiting. type: integer values: description: 'Values passed to Helm. It is possible to diff --git a/pkg/apis/fleet.cattle.io/v1alpha1/bundledeployment_types.go b/pkg/apis/fleet.cattle.io/v1alpha1/bundledeployment_types.go index 0d22bd5a71..6097a3dec9 100644 --- a/pkg/apis/fleet.cattle.io/v1alpha1/bundledeployment_types.go +++ b/pkg/apis/fleet.cattle.io/v1alpha1/bundledeployment_types.go @@ -235,8 +235,9 @@ type HelmOptions struct { Version string `json:"version,omitempty"` // TimeoutSeconds is the number of seconds Fleet passes to Helm operations. - // Omitted or zero values disable Helm status waiting; positive values enable - // Helm status waiting up to the configured timeout. + // Omitted or zero values use hook-only waiting. Positive values enable Helm + // status waiting during install and upgrade operations up to the configured + // timeout; uninstall and rollback operations keep hook-only waiting. TimeoutSeconds int `json:"timeoutSeconds,omitempty"` // Values passed to Helm. It is possible to specify the keys and values