From 4b56a397975cb8eaf86a4ad1c1c13b0763cdb360 Mon Sep 17 00:00:00 2001 From: Zhongcheng Lao Date: Tue, 15 Nov 2022 08:44:05 +0800 Subject: [PATCH] Allow 'h' in HelmRelease timeout field Signed-off-by: Zhongcheng Lao --- api/v2beta1/helmrelease_types.go | 2 +- config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/v2beta1/helmrelease_types.go b/api/v2beta1/helmrelease_types.go index 170c98e8a..00d6a9d38 100644 --- a/api/v2beta1/helmrelease_types.go +++ b/api/v2beta1/helmrelease_types.go @@ -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"` diff --git a/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml b/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml index 3e0021fd2..1ceb2af0b 100644 --- a/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml +++ b/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml @@ -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