Allow 'h' in HelmRelease timeout field

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>
This commit is contained in:
Zhongcheng Lao 2022-11-15 08:44:05 +08:00
parent 5be76a3f5c
commit 4b56a39797
No known key found for this signature in database
GPG Key ID: 3B0C92A7E58EF413
2 changed files with 2 additions and 2 deletions

View File

@ -123,7 +123,7 @@ type HelmReleaseSpec struct {
// Timeout is the time to wait for any individual Kubernetes operation (like Jobs
// for hooks) during the performance of a Helm action. Defaults to '5m0s'.
// +kubebuilder:validation:Type=string
// +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ms|s|m))+$"
// +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ms|s|m|h))+$"
// +optional
Timeout *metav1.Duration `json:"timeout,omitempty"`

View File

@ -584,7 +584,7 @@ spec:
description: Timeout is the time to wait for any individual Kubernetes
operation (like Jobs for hooks) during the performance of a Helm
action. Defaults to '5m0s'.
pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
type: string
uninstall:
description: Uninstall holds the configuration for Helm uninstall