Fix Helm Release Timeout Issue (#3240)

* fix helm release timeout issue fix helm release timeout issue * update api docs
kubermatic · Jun 18, 2024 · bce2ed9 · bce2ed9
1 parent 5b613f2
commit bce2ed9
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 21 deletions.
diff --git a/docs/api_reference/v1beta2.en.md b/docs/api_reference/v1beta2.en.md
@@ -1,6 +1,6 @@
 +++
 title = "v1beta2 API Reference"
-date = 2024-06-05T16:21:27+03:00
+date = 2024-06-18T14:12:31+01:00
 weight = 11
 +++
 ## v1beta2
@@ -428,7 +428,7 @@ GCESpec defines the GCE cloud provider
 | releaseName | ReleaseName is [RELEASE] part of the `helm upgrade [RELEASE] [CHART]` command. Empty is defaulted to chart. | string | false |
 | namespace | Namespace is --namespace flag of the `helm upgrade` command. A namespace to use for a release. | string | true |
 | wait | Wait is --wait flag of the `helm install` command. | bool | false |
-| timeout | WaitTimeout --timeout flag of the `helm install` command. | time.Duration | false |
+| timeout | WaitTimeout --timeout flag of the `helm install` command. | metav1.Duration | false |
 | values | Values provide optional overrides of the helm values. | [][HelmValues](#helmvalues) | false |
 
 [Back to Group](#v1beta2)

diff --git a/docs/api_reference/v1beta3.en.md b/docs/api_reference/v1beta3.en.md
@@ -1,6 +1,6 @@
 +++
 title = "v1beta3 API Reference"
-date = 2024-06-05T16:21:27+03:00
+date = 2024-06-18T14:12:31+01:00
 weight = 11
 +++
 ## v1beta3
@@ -416,7 +416,7 @@ GCESpec defines the GCE cloud provider
 | releaseName | ReleaseName is [RELEASE] part of the `helm upgrade [RELEASE] [CHART]` command. Empty is defaulted to chart. | string | false |
 | namespace | Namespace is --namespace flag of the `helm upgrade` command. A namespace to use for a release. | string | true |
 | wait | Wait is --wait flag of the `helm install` command. | bool | false |
-| timeout | WaitTimeout --timeout flag of the `helm install` command. | time.Duration | false |
+| timeout | WaitTimeout --timeout flag of the `helm install` command. | metav1.Duration | false |
 | values | Values provide optional overrides of the helm values. | [][HelmValues](#helmvalues) | false |
 
 [Back to Group](#v1beta3)

diff --git a/pkg/apis/kubeone/types.go b/pkg/apis/kubeone/types.go
@@ -18,7 +18,6 @@ package kubeone
 
 import (
 	"encoding/json"
-	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -160,7 +159,7 @@ type HelmRelease struct {
 	Wait bool `json:"wait,omitempty"`
 
 	// WaitTimeout --timeout flag of the `helm install` command. Default to 5m
-	WaitTimeout time.Duration `json:"timeout,omitempty"`
+	WaitTimeout metav1.Duration `json:"timeout,omitempty"`
 
 	// Values provide optional overrides of the helm values.
 	Values []HelmValues `json:"values,omitempty"`

diff --git a/pkg/apis/kubeone/v1beta2/defaults.go b/pkg/apis/kubeone/v1beta2/defaults.go
@@ -256,8 +256,8 @@ func SetDefaults_HelmReleases(obj *KubeOneCluster) {
 			obj.HelmReleases[idx].ReleaseName = hr.Chart
 		}
 
-		if hr.WaitTimeout == 0 {
-			obj.HelmReleases[idx].WaitTimeout = time.Minute * 5
+		if hr.WaitTimeout.Duration == 0 {
+			obj.HelmReleases[idx].WaitTimeout.Duration = time.Minute * 5
 		}
 	}
 }

diff --git a/pkg/apis/kubeone/v1beta2/types.go b/pkg/apis/kubeone/v1beta2/types.go
@@ -18,7 +18,6 @@ package v1beta2
 
 import (
 	"encoding/json"
-	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -157,7 +156,7 @@ type HelmRelease struct {
 	Wait bool `json:"wait,omitempty"`
 
 	// WaitTimeout --timeout flag of the `helm install` command.
-	WaitTimeout time.Duration `json:"timeout,omitempty"`
+	WaitTimeout metav1.Duration `json:"timeout,omitempty"`
 
 	// Values provide optional overrides of the helm values.
 	Values []HelmValues `json:"values,omitempty"`

diff --git a/pkg/apis/kubeone/v1beta2/zz_generated.conversion.go b/pkg/apis/kubeone/v1beta2/zz_generated.conversion.go
diff --git a/pkg/apis/kubeone/v1beta2/zz_generated.deepcopy.go b/pkg/apis/kubeone/v1beta2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kubeone/v1beta3/defaults.go b/pkg/apis/kubeone/v1beta3/defaults.go
@@ -256,8 +256,8 @@ func SetDefaults_HelmReleases(obj *KubeOneCluster) {
 			obj.HelmReleases[idx].ReleaseName = hr.Chart
 		}
 
-		if hr.WaitTimeout == 0 {
-			obj.HelmReleases[idx].WaitTimeout = time.Minute * 5
+		if hr.WaitTimeout.Duration == 0 {
+			obj.HelmReleases[idx].WaitTimeout.Duration = time.Minute * 5
 		}
 	}
 }

diff --git a/pkg/apis/kubeone/v1beta3/types.go b/pkg/apis/kubeone/v1beta3/types.go
@@ -18,7 +18,6 @@ package v1beta3
 
 import (
 	"encoding/json"
-	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -157,7 +156,7 @@ type HelmRelease struct {
 	Wait bool `json:"wait,omitempty"`
 
 	// WaitTimeout --timeout flag of the `helm install` command.
-	WaitTimeout time.Duration `json:"timeout,omitempty"`
+	WaitTimeout metav1.Duration `json:"timeout,omitempty"`
 
 	// Values provide optional overrides of the helm values.
 	Values []HelmValues `json:"values,omitempty"`

diff --git a/pkg/apis/kubeone/v1beta3/zz_generated.conversion.go b/pkg/apis/kubeone/v1beta3/zz_generated.conversion.go
diff --git a/pkg/apis/kubeone/v1beta3/zz_generated.deepcopy.go b/pkg/apis/kubeone/v1beta3/zz_generated.deepcopy.go
diff --git a/pkg/apis/kubeone/zz_generated.deepcopy.go b/pkg/apis/kubeone/zz_generated.deepcopy.go
diff --git a/pkg/localhelm/helm3.go b/pkg/localhelm/helm3.go
@@ -295,7 +295,7 @@ func newHelmInstallClient(cfg *helmaction.Configuration, release kubeoneapi.Helm
 	helmInstall.RepoURL = release.RepoURL
 	helmInstall.Version = release.Version
 	helmInstall.Wait = release.Wait
-	helmInstall.Timeout = release.WaitTimeout
+	helmInstall.Timeout = release.WaitTimeout.Duration
 
 	return helmInstall
 }