Skip to content

Commit f0f549e

Browse files
feat: Add get K8s version and helm dep update
1 parent 2af7367 commit f0f549e

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

functions/k8s.ps1

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<#PSScriptInfo
2-
.VERSION 1.0.1
2+
.VERSION 1.1.0
33
.GUID bfaf255e-8e7b-4354-824f-46ac9625cab5
44
.AUTHOR Code Dx
55
.DESCRIPTION Includes Kubernetes-related helpers
@@ -83,6 +83,10 @@ function Get-KubectlServerVersion {
8383
"$($version[1]).$($version[2])"
8484
}
8585

86+
function Get-KubectlServerVersionNumber {
87+
[float]::Parse((Get-KubectlServerVersion))
88+
}
89+
8690
function Get-KubectlServerVersionMajor {
8791
[int]::Parse(((Get-KubectlServerSemanticVersion)[1]))
8892
}

functions/resource.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<#PSScriptInfo
2-
.VERSION 1.2.0
2+
.VERSION 1.3.0
33
.GUID 7eadb850-7e43-4308-a9fa-0119a0a883a3
44
.AUTHOR Code Dx
55
.DESCRIPTION Includes resource-related helpers
@@ -446,11 +446,12 @@ function New-HelmCommand(
446446
}
447447
$values += $helmValuesPath
448448

449-
$helmOutput = "helm upgrade --namespace $namespace --install --timeout $timeout $crdAction $valuesParam "
449+
$helmOutput = "helm dependency update ""$chartRootPath""`n"
450+
$helmOutput += "helm upgrade --namespace $namespace --install --timeout $timeout $crdAction $valuesParam "
450451
$values | ForEach-Object {
451452
$helmOutput += "--values ""$_"" "
452453
}
453-
$helmOutput += "$releaseName $chartRootPath"
454+
$helmOutput += "$releaseName ""$chartRootPath"""
454455

455456
New-ResourceFile 'HelmCommand' $namespace "helmcommand-install-$releaseName" $helmOutput
456457
}

guided-setup.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
RootModule = 'guided-setup'
1313

1414
# Version number of this module.
15-
ModuleVersion = '1.13.0'
15+
ModuleVersion = '1.14.0'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = @('Core')
@@ -74,7 +74,7 @@ PowerShellVersion = '7.0.0'
7474
# $files = (Get-ChildItem -LiteralPath './functions' -Recurse -Include '*.ps1','*.psm1') + (Get-ChildItem './guided-setup.psm1')
7575
# [string]::join(',',($files | ForEach-Object { Select-String -input $_ -pattern '^function\s([^(]+)(?:\s|\()' -allmatches | ForEach-Object { "'$($_.matches.groups[1].value)'" } } | Sort-Object))
7676
#
77-
FunctionsToExport = @('Add-HelmRepo','Add-KeystoreAlias','Add-ResourceLabel','Add-Step','Add-StepTransition','Add-StepTransitions','Clear-HostStep','Convert-Base64','ConvertTo-Map','ConvertTo-PsonMap','ConvertTo-PsonStringArray','ConvertTo-YamlIntArray','ConvertTo-YamlMap','ConvertTo-YamlMap','ConvertTo-YamlStringArray','Copy-DBBackupFiles','Copy-K8sItem','Edit-ResourceJsonPath','Edit-ResourceStrategicPatch','Format-KeyValueAssignment','Format-NodeSelector','Format-PodTolerationNoScheduleNoExecute','Format-ResourceLimitRequest','Get-AppCommandPath','Get-CertificateFromCsr','Get-CommonName','Get-CsrSignerNameLegacyUnknown','Get-DatabaseUrl','Get-DockerImageParts','Get-HelmChartFullname','Get-HelmReleaseAppVersion','Get-HelmReleaseHistory','Get-HelmValues','Get-HelmVersionMajorMinor','Get-IPv4AddressList','Get-KeystorePasswordEscaped','Get-KeytoolJavaSettings','Get-KeytoolJavaSpec','Get-KubectlClientVersion','Get-KubectlContext','Get-KubectlContexts','Get-KubectlDryRunParam','Get-KubectlServerSemanticVersion','Get-KubectlServerVersion','Get-KubectlServerVersionMajor','Get-KubectlServerVersionMinor','Get-KubectlVersion','Get-KubernetesEndpointsPort','Get-KubernetesPort','Get-MasterFilePosAfterReset','Get-ResourceDirectoryPath','Get-SecretFieldValue','Get-SemanticVersionComponents','Get-ServiceAccountName','Get-TrustedCaCertAlias','Get-VirtualCpuCountFromReservation','Import-TrustedCaCert','Import-TrustedCaCerts','Invoke-GitClone','Invoke-GuidedSetup','Invoke-HelmCommand','New-Certificate','New-CertificateConfigMap','New-CertificateConfigMapResource','New-CertificateSecret','New-CertificateSecretResource','New-ConfigMap','New-ConfigMapResource','New-Csr','New-CsrApproval','New-CsrResource','New-Database','New-DockerImagePullSecretResource','New-GenericSecret','New-GenericSecretResource','New-GitRepository','New-HelmCommand','New-HelmControllerChartSource','New-HelmControllerConfigMapValues','New-HelmControllerGitSource','New-HelmOperatorChartSource','New-HelmOperatorConfigMapValues','New-HelmOperatorGitSource','New-HelmRelease','New-HelmRepository','New-ImagePullSecret','New-Namespace','New-NamespacedResource','New-NamespacedResourceFromYaml','New-NamespaceResource','New-PriorityClass','New-PriorityClassResource','New-ResourceFile','New-SealedSecret','New-SealedSecretFile','New-SecretResourceFile','Read-HostChoice','Read-HostEnter','Read-HostSecureText','Read-HostText','Remove-ConfigMap','Remove-CsrResource','Remove-Database','Remove-KeystoreAlias','Remove-KubernetesJob','Remove-KubernetesPvc','Remove-NamespacedResource','Remove-Pod','Remove-PriorityClass','Remove-ResourceLabel','Remove-Secret','Remove-VeleroBackupSchedule','Set-CustomResourceDefinitionResource','Set-DeploymentReplicas','Set-GuidedSetupModulePreferences','Set-K8sResource','Set-KeystorePassword','Set-KubectlContext','Set-KubectlFromFilePath','Set-NamespaceLabel','Set-NonNamespacedResource','Set-Replicas','Set-ResourceDirectory','Set-StatefulSetReplicas','Split-DockerName','Split-DockerRepo','Start-SlaveDB','Stop-SlaveDB','Test-CertificateSigningRequestV1Beta1','Test-CertificateSigningRequestV1Beta1','Test-ClusterInfo','Test-ConfigMap','Test-CsrResource','Test-CurrentKubeContext','Test-Database','Test-Deployment','Test-DeploymentLabel','Test-EmailAddress','Test-HelmRelease','Test-IsBlacklisted','Test-IsCore','Test-IsElevated','Test-IsValidParameterValue','Test-KeystorePassword','Test-KeyToolCertificate','Test-KubectlUsesDryRunBool {','Test-KubernetesJob','Test-MinPsMajorVersion','Test-Namespace','Test-NamespacedResource','Test-NonNamespacedResource','Test-Pod','Test-PriorityClass','Test-ResourceApiVersion','Test-Secret','Test-Service','Test-SetupKubernetesVersion','Test-StatefulSet','Test-VeleroBackupSchedule','Wait-AllRunningPods','Wait-Deployment','Wait-JobSuccess','Wait-ReplicasReady','Wait-RunningPod','Wait-StatefulSet','Write-ErrorMessageAndExit','Write-HostSection','Write-ImportantNote','Write-StepGraph')
77+
FunctionsToExport = @('Add-HelmRepo','Add-KeystoreAlias','Add-ResourceLabel','Add-Step','Add-StepTransition','Add-StepTransitions','Clear-HostStep','Convert-Base64','ConvertTo-Map','ConvertTo-PsonMap','ConvertTo-PsonStringArray','ConvertTo-YamlIntArray','ConvertTo-YamlMap','ConvertTo-YamlMap','ConvertTo-YamlStringArray','Copy-DBBackupFiles','Copy-K8sItem','Edit-ResourceJsonPath','Edit-ResourceStrategicPatch','Format-KeyValueAssignment','Format-NodeSelector','Format-PodTolerationNoScheduleNoExecute','Format-ResourceLimitRequest','Get-AppCommandPath','Get-CertificateFromCsr','Get-CommonName','Get-CsrSignerNameLegacyUnknown','Get-DatabaseUrl','Get-DockerImageParts','Get-HelmChartFullname','Get-HelmReleaseAppVersion','Get-HelmReleaseHistory','Get-HelmValues','Get-HelmVersionMajorMinor','Get-IPv4AddressList','Get-KeystorePasswordEscaped','Get-KeytoolJavaSettings','Get-KeytoolJavaSpec','Get-KubectlClientVersion','Get-KubectlContext','Get-KubectlContexts','Get-KubectlDryRunParam','Get-KubectlServerSemanticVersion','Get-KubectlServerVersion','Get-KubectlServerVersionMajor','Get-KubectlServerVersionMinor','Get-KubectlServerVersionNumber','Get-KubectlVersion','Get-KubernetesEndpointsPort','Get-KubernetesPort','Get-MasterFilePosAfterReset','Get-ResourceDirectoryPath','Get-SecretFieldValue','Get-SemanticVersionComponents','Get-ServiceAccountName','Get-TrustedCaCertAlias','Get-VirtualCpuCountFromReservation','Import-TrustedCaCert','Import-TrustedCaCerts','Invoke-GitClone','Invoke-GuidedSetup','Invoke-HelmCommand','New-Certificate','New-CertificateConfigMap','New-CertificateConfigMapResource','New-CertificateSecret','New-CertificateSecretResource','New-ConfigMap','New-ConfigMapResource','New-Csr','New-CsrApproval','New-CsrResource','New-Database','New-DockerImagePullSecretResource','New-GenericSecret','New-GenericSecretResource','New-GitRepository','New-HelmCommand','New-HelmControllerChartSource','New-HelmControllerConfigMapValues','New-HelmControllerGitSource','New-HelmOperatorChartSource','New-HelmOperatorConfigMapValues','New-HelmOperatorGitSource','New-HelmRelease','New-HelmRepository','New-ImagePullSecret','New-Namespace','New-NamespacedResource','New-NamespacedResourceFromYaml','New-NamespaceResource','New-PriorityClass','New-PriorityClassResource','New-ResourceFile','New-SealedSecret','New-SealedSecretFile','New-SecretResourceFile','Read-HostChoice','Read-HostEnter','Read-HostSecureText','Read-HostText','Remove-ConfigMap','Remove-CsrResource','Remove-Database','Remove-KeystoreAlias','Remove-KubernetesJob','Remove-KubernetesPvc','Remove-NamespacedResource','Remove-Pod','Remove-PriorityClass','Remove-ResourceLabel','Remove-Secret','Remove-VeleroBackupSchedule','Set-CustomResourceDefinitionResource','Set-DeploymentReplicas','Set-GuidedSetupModulePreferences','Set-K8sResource','Set-KeystorePassword','Set-KubectlContext','Set-KubectlFromFilePath','Set-NamespaceLabel','Set-NonNamespacedResource','Set-Replicas','Set-ResourceDirectory','Set-StatefulSetReplicas','Split-DockerName','Split-DockerRepo','Start-SlaveDB','Stop-SlaveDB','Test-CertificateSigningRequestV1Beta1','Test-CertificateSigningRequestV1Beta1','Test-ClusterInfo','Test-ConfigMap','Test-CsrResource','Test-CurrentKubeContext','Test-Database','Test-Deployment','Test-DeploymentLabel','Test-EmailAddress','Test-HelmRelease','Test-IsBlacklisted','Test-IsCore','Test-IsElevated','Test-IsValidParameterValue','Test-KeystorePassword','Test-KeyToolCertificate','Test-KubectlUsesDryRunBool {','Test-KubernetesJob','Test-MinPsMajorVersion','Test-Namespace','Test-NamespacedResource','Test-NonNamespacedResource','Test-Pod','Test-PriorityClass','Test-ResourceApiVersion','Test-Secret','Test-Service','Test-SetupKubernetesVersion','Test-StatefulSet','Test-VeleroBackupSchedule','Wait-AllRunningPods','Wait-Deployment','Wait-JobSuccess','Wait-ReplicasReady','Wait-RunningPod','Wait-StatefulSet','Write-ErrorMessageAndExit','Write-HostSection','Write-ImportantNote','Write-StepGraph')
7878

7979
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
8080
CmdletsToExport = @()

0 commit comments

Comments
 (0)