diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index 6fcdb4c02..0503b8503 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -20,6 +20,11 @@ apt-get install -y kubectl # Install Helm curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash +# Install minikube +curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 +sudo install minikube-linux-amd64 /usr/local/bin/minikube + + # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" if ! command -v kubectl; then @@ -32,7 +37,16 @@ if ! command -v helm; then exit 1 fi +# Run tests to determine that the software installed as expected +echo "Testing to make sure that minikube was installed" +if ! command -v minikube; then + echo "minikube was not installed" + exit 1 +fi + # Document what was added to the image echo "Lastly, documenting what we added to the metadata file" DocumentInstalledItem "kubectl ($(kubectl version --client --short |& head -n 1))" DocumentInstalledItem "helm ($(helm version --short |& head -n 1))" +# minikube version output already has word minikube in it. example minikube version: v1.9.2 +DocumentInstalledItem "$(minikube version --short)" \ No newline at end of file diff --git a/images/win/scripts/Installers/Install-KubernetesCli.ps1 b/images/win/scripts/Installers/Install-KubernetesCli.ps1 index c6ad04bc7..e006f7793 100644 --- a/images/win/scripts/Installers/Install-KubernetesCli.ps1 +++ b/images/win/scripts/Installers/Install-KubernetesCli.ps1 @@ -4,3 +4,4 @@ ################################################################################ Choco-Install -PackageName kubernetes-cli +Choco-Install -PackageName minikube diff --git a/images/win/scripts/Installers/Validate-KubernetesCli.ps1 b/images/win/scripts/Installers/Validate-KubernetesCli.ps1 index da83f2fbe..5b3d768b6 100644 --- a/images/win/scripts/Installers/Validate-KubernetesCli.ps1 +++ b/images/win/scripts/Installers/Validate-KubernetesCli.ps1 @@ -26,3 +26,26 @@ _Environment:_ "@ Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description + +if((Get-Command -Name 'minikube')) +{ + Write-Host "minikube $(minikube version --short) in path" +} +else +{ + Write-Host "minikube is not in path" + exit 1 +} + +# Adding description of the software to Markdown +$SoftwareName = "minikube" + +$version = $(minikube version --short=true) + +$Description = @" +_Version:_ $version
+_Environment:_ +* PATH: contains location of minikube.exe +"@ + +Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description