From 18e371964f547540b369180ff5958bad59bed81e Mon Sep 17 00:00:00 2001
From: Dmitry Shibanov <v-dmshib@microsoft.com>
Date: Tue, 17 Mar 2020 16:46:13 +0300
Subject: [PATCH 1/3] add helm istallation

---
 .../win/scripts/Installers/Install-Docker.ps1 |  4 +++
 .../scripts/Installers/Validate-Docker.ps1    | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1
index cd1f96969..ec4f0d895 100644
--- a/images/win/scripts/Installers/Install-Docker.ps1
+++ b/images/win/scripts/Installers/Install-Docker.ps1
@@ -14,3 +14,7 @@ Install-Package -Name docker -ProviderName DockerMsftProvider -Force
 Start-Service docker
 
 choco install docker-compose -y
+
+# Install helm
+Write-Host "Install Helm"
+choco install kubernetes-helm
\ No newline at end of file
diff --git a/images/win/scripts/Installers/Validate-Docker.ps1 b/images/win/scripts/Installers/Validate-Docker.ps1
index cc9d496ef..afa591554 100644
--- a/images/win/scripts/Installers/Validate-Docker.ps1
+++ b/images/win/scripts/Installers/Validate-Docker.ps1
@@ -44,3 +44,29 @@ _Environment:_
 "@
 
 Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
+
+# Validate helm
+if (Get-Command -Name 'helm')
+{
+    Write-Host "helm on path"
+    Write-Host "Full version:"
+    helm version
+    Write-Host "Short version:"
+    helm version --short
+}
+else
+{
+    Write-Host 'helm is not on path'
+    exit 1
+}
+
+$version = $(helm version --short)
+$SoftwareName = "Helm"
+
+$Description = @"
+_Version:_ $version<br/>
+_Environment:_
+* PATH: contains location of helm
+"@
+
+Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description
\ No newline at end of file

From 1941e8d57daa65925f3d2b25d856ae0b0149e5fe Mon Sep 17 00:00:00 2001
From: Dmitry Shibanov <v-dmshib@microsoft.com>
Date: Wed, 18 Mar 2020 10:00:46 +0300
Subject: [PATCH 2/3] remove extra output

---
 images/win/scripts/Installers/Validate-Docker.ps1 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/images/win/scripts/Installers/Validate-Docker.ps1 b/images/win/scripts/Installers/Validate-Docker.ps1
index afa591554..08ec7641b 100644
--- a/images/win/scripts/Installers/Validate-Docker.ps1
+++ b/images/win/scripts/Installers/Validate-Docker.ps1
@@ -51,8 +51,6 @@ if (Get-Command -Name 'helm')
     Write-Host "helm on path"
     Write-Host "Full version:"
     helm version
-    Write-Host "Short version:"
-    helm version --short
 }
 else
 {

From a976829e967b2a4020b80d03ac8dd6d2f7eb3753 Mon Sep 17 00:00:00 2001
From: Dmitry Shibanov <v-dmshib@microsoft.com>
Date: Wed, 18 Mar 2020 10:16:29 +0300
Subject: [PATCH 3/3] remove debug line

---
 images/win/scripts/Installers/Validate-Docker.ps1 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/images/win/scripts/Installers/Validate-Docker.ps1 b/images/win/scripts/Installers/Validate-Docker.ps1
index 08ec7641b..9dab4f460 100644
--- a/images/win/scripts/Installers/Validate-Docker.ps1
+++ b/images/win/scripts/Installers/Validate-Docker.ps1
@@ -49,8 +49,6 @@ Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $
 if (Get-Command -Name 'helm')
 {
     Write-Host "helm on path"
-    Write-Host "Full version:"
-    helm version
 }
 else
 {