Respect timeout field for helm extensions in install2 command (#1603)

replicatedhq · Dec 10, 2024 · 86e6719 · 86e6719
1 parent 92666c5
commit 86e6719
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 12 deletions.
diff --git a/pkg/addons2/adminconsole/install.go b/pkg/addons2/adminconsole/install.go
@@ -36,7 +36,13 @@ func (a *AdminConsole) Install(ctx context.Context, kcli client.Client, writer *
 		return errors.Wrap(err, "create helm client")
 	}
 
-	_, err = hcli.Install(ctx, releaseName, Metadata.Location, Metadata.Version, helmValues, namespace)
+	_, err = hcli.Install(ctx, helm.InstallOptions{
+		ReleaseName:  releaseName,
+		ChartPath:    Metadata.Location,
+		ChartVersion: Metadata.Version,
+		Values:       helmValues,
+		Namespace:    namespace,
+	})
 	if err != nil {
 		return errors.Wrap(err, "install admin console")
 	}

diff --git a/pkg/addons2/openebs/install.go b/pkg/addons2/openebs/install.go
@@ -18,7 +18,13 @@ func (o *OpenEBS) Install(ctx context.Context, kcli client.Client, writer *spinn
 		return errors.Wrap(err, "create helm client")
 	}
 
-	_, err = hcli.Install(ctx, releaseName, Metadata.Location, Metadata.Version, helmValues, namespace)
+	_, err = hcli.Install(ctx, helm.InstallOptions{
+		ReleaseName:  releaseName,
+		ChartPath:    Metadata.Location,
+		ChartVersion: Metadata.Version,
+		Values:       helmValues,
+		Namespace:    namespace,
+	})
 	if err != nil {
 		return errors.Wrap(err, "install openebs")
 	}

diff --git a/pkg/addons2/registry/install.go b/pkg/addons2/registry/install.go
@@ -30,7 +30,13 @@ func (r *Registry) Install(ctx context.Context, kcli client.Client, writer *spin
 		return errors.Wrap(err, "create helm client")
 	}
 
-	_, err = hcli.Install(ctx, releaseName, Metadata.Location, Metadata.Version, helmValues, namespace)
+	_, err = hcli.Install(ctx, helm.InstallOptions{
+		ReleaseName:  releaseName,
+		ChartPath:    Metadata.Location,
+		ChartVersion: Metadata.Version,
+		Values:       helmValues,
+		Namespace:    namespace,
+	})
 	if err != nil {
 		return errors.Wrap(err, "install registry")
 	}

diff --git a/pkg/addons2/velero/install.go b/pkg/addons2/velero/install.go
@@ -25,7 +25,13 @@ func (v *Velero) Install(ctx context.Context, kcli client.Client, writer *spinne
 		return errors.Wrap(err, "create helm client")
 	}
 
-	_, err = hcli.Install(ctx, releaseName, Metadata.Location, Metadata.Version, helmValues, namespace)
+	_, err = hcli.Install(ctx, helm.InstallOptions{
+		ReleaseName:  releaseName,
+		ChartPath:    Metadata.Location,
+		ChartVersion: Metadata.Version,
+		Values:       helmValues,
+		Namespace:    namespace,
+	})
 	if err != nil {
 		return errors.Wrap(err, "install velero")
 	}

diff --git a/pkg/extensions/extensions.go b/pkg/extensions/extensions.go
@@ -64,7 +64,14 @@ func Install(ctx context.Context) error {
 			return errors.Wrap(err, "unmarshal values")
 		}
 
-		_, err = hcli.Install(ctx, ext.Name, ext.ChartName, ext.Version, values, ext.TargetNS)
+		_, err = hcli.Install(ctx, helm.InstallOptions{
+			ReleaseName:  ext.Name,
+			ChartPath:    ext.ChartName,
+			ChartVersion: ext.Version,
+			Values:       values,
+			Namespace:    ext.TargetNS,
+			Timeout:      ext.Timeout.Duration,
+		})
 		if err != nil {
 			return errors.Wrap(err, "helm install")
 		}

diff --git a/pkg/helm/client.go b/pkg/helm/client.go
@@ -85,6 +85,15 @@ type HelmOptions struct {
 	Writer     io.Writer
 }
 
+type InstallOptions struct {
+	ReleaseName  string
+	ChartPath    string
+	ChartVersion string
+	Values       map[string]interface{}
+	Namespace    string
+	Timeout      time.Duration
+}
+
 type Helm struct {
 	tmpdir   string
 	kversion *semver.Version
@@ -248,22 +257,27 @@ func (h *Helm) getActionCfg(namespace string) (*action.Configuration, error) {
 	return cfg, nil
 }
 
-func (h *Helm) Install(ctx context.Context, releaseName string, chartPath string, chartVersion string, values map[string]interface{}, namespace string) (*release.Release, error) {
-	cfg, err := h.getActionCfg(namespace)
+func (h *Helm) Install(ctx context.Context, opts InstallOptions) (*release.Release, error) {
+	cfg, err := h.getActionCfg(opts.Namespace)
 	if err != nil {
 		return nil, fmt.Errorf("get action configuration: %w", err)
 	}
 
 	client := action.NewInstall(cfg)
-	client.ReleaseName = releaseName
-	client.Namespace = namespace
+	client.ReleaseName = opts.ReleaseName
+	client.Namespace = opts.Namespace
 	client.Replace = true
 	client.CreateNamespace = true
 	client.WaitForJobs = true
 	client.Wait = true
-	client.Timeout = 5 * time.Minute
 
-	localPath, err := h.PullOCI(chartPath, chartVersion)
+	if opts.Timeout != 0 {
+		client.Timeout = opts.Timeout
+	} else {
+		client.Timeout = 5 * time.Minute
+	}
+
+	localPath, err := h.PullOCI(opts.ChartPath, opts.ChartVersion)
 	if err != nil {
 		return nil, fmt.Errorf("pull oci: %w", err)
 	}
@@ -280,7 +294,7 @@ func (h *Helm) Install(ctx context.Context, releaseName string, chartPath string
 		}
 	}
 
-	cleanVals := cleanUpGenericMap(values)
+	cleanVals := cleanUpGenericMap(opts.Values)
 
 	release, err := client.RunWithContext(ctx, chartRequested, cleanVals)
 	if err != nil {