feat: Add helm timeout parameter

Author: steveblackduck

functions/helm.ps1

@@ -1,5 +1,5 @@
 <#PSScriptInfo
-.VERSION 1.1.0
+.VERSION 1.2.0
 .GUID 04273f72-e001-415b-add0-e5e95e378355
 .AUTHOR Code Dx
 .DESCRIPTION Includes Helm-related helpers
@@ -58,6 +58,7 @@ function Invoke-HelmCommand([string] $message,
 	[int]      $waitSeconds, 
 	[string]   $namespace, 
 	[string]   $releaseName, 
+	[string]   $timeout = '5m0s',
 	[string]   $chartReference, 
 	[string]   $valuesFile,  
 	[string[]] $extraValuesPaths, 
@@ -105,8 +106,8 @@ function Invoke-HelmCommand([string] $message,
 			$versionParam = $versionParam + "--version"
 			$versionParam = $versionParam + "$version"
 		}
-		
-		Write-Verbose "Running Helm Upgrade: $message..."
+	
+		Write-Verbose "Running Helm Upgrade: $message (timeout $timeout)..."
 
 		$dryRunParam = $dryRun ? '--dry-run' : ''
 		$debugParam = $dryRun ? '--debug' : ''
@@ -117,7 +118,7 @@ function Invoke-HelmCommand([string] $message,
 		}
 
 		$crdAction = $skipCRDs ? '--skip-crds' : ''
-		$helmOutput = helm upgrade --namespace $namespace --install $valuesParam $releaseName @($values) $chartReference @($versionParam) $crdAction $dryRunParam $debugParam
+		$helmOutput = helm upgrade --namespace $namespace --install $valuesParam $releaseName --timeout $timeout @($values) $chartReference @($versionParam) $crdAction $dryRunParam $debugParam
 		if ($LASTEXITCODE -ne 0) {
 			throw "Unable to run helm upgrade/install, helm exited with code $LASTEXITCODE."
 		}

functions/resource.ps1

@@ -1,5 +1,5 @@
 <#PSScriptInfo
-.VERSION 1.1.0
+.VERSION 1.2.0
 .GUID 7eadb850-7e43-4308-a9fa-0119a0a883a3
 .AUTHOR Code Dx
 .DESCRIPTION Includes resource-related helpers
@@ -306,6 +306,8 @@ function New-HelmRelease(
 	[string]    $namespace,
 	[Parameter(Position=2)] [Parameter(ParameterSetName='GitChart')] [Parameter(ParameterSetName='RepoChart')]
 	[string]    $releaseName,
+	[Parameter(Position=3)] [Parameter(ParameterSetName='GitChart')] [Parameter(ParameterSetName='RepoChart')]
+	[string]    $timeout = '5m0s',
 	[Parameter(ParameterSetName='GitChart')]
 	[string]    $chartGitName,
 	[Parameter(ParameterSetName='GitChart')]
@@ -396,6 +398,7 @@ metadata:
   namespace: {2}
 spec:
   releaseName: {3}
+  timeout: {9}
   chart:
 {4}
 {5}
@@ -407,7 +410,8 @@ spec:
 	($useHelmController ? 'helm.toolkit.fluxcd.io/v2beta1' : 'helm.fluxcd.io/v1'),
 	$name,$namespace,$releaseName,$chartSource,$valuesFrom,$values,
 	($useHelmController ? '  interval: 1m0s' : ''),
-	($useHelmController ? "skipCRDs: true" : "crds: 'Skip'")
+	($useHelmController ? "skipCRDs: true" : "crds: 'Skip'"),
+	$timeout
 
     New-ResourceFile 'HelmRelease' $namespace $name $helmRelease
 }
@@ -418,7 +422,8 @@ function New-HelmCommand(
 	[string]    $releaseName,
 	[string]    $chartRootPath,
 	[string[]]  $valuesPaths,
-	[hashtable] $dockerImageNames) {
+	[hashtable] $dockerImageNames,
+	[string]    $timeout = '5m0s') {
 
 	$crdAction = '--skip-crds'
 	$valuesParam = '--reset-values' # merge $values with the latest, default chart values
@@ -441,7 +446,7 @@ function New-HelmCommand(
 	}
 	$values += $helmValuesPath
 
-	$helmOutput = "helm upgrade --namespace $namespace --install $crdAction $valuesParam "
+	$helmOutput = "helm upgrade --namespace $namespace --install --timeout $timeout $crdAction $valuesParam "
 	$values | ForEach-Object {
 		$helmOutput += "--values ""$_"" "
 	}

guided-setup.psd1

@@ -12,7 +12,7 @@
 RootModule = 'guided-setup'
 
 # Version number of this module.
-ModuleVersion = '1.10.0'
+ModuleVersion = '1.11.0'
 
 # Supported PSEditions
 CompatiblePSEditions = @('Core')