Merge pull request #110 from IBM-Cloud/109

Install supported version of kubectl for IBM kubernetes service

Author: steveclay

linux-installer/idt-installer

@@ -212,7 +212,8 @@ function install_darwin_deps {
      #-- kubectl:
     log "Installing/updating external dependency: kubectl"
     if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then
-      curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl
+      local kube_version=$(get_kubectl_version)
+      curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/v$kube_version/bin/darwin/amd64/kubectl
       $SUDO mv ./kubectl /usr/local/bin/kubectl
       $SUDO chmod +x /usr/local/bin/kubectl
       log  "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/"
@@ -259,7 +260,8 @@ function install_deps_with_apt_get {
     #-- kubectl:
     log "Installing/updating external dependency: kubectl"
     if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then
-      curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
+      local kube_version=$(get_kubectl_version)
+      curl --progress-bar -LO https://storage.googleapis.com/kubernetes-release/release/v$kube_version/bin/linux/amd64/kubectl
       $SUDO mv ./kubectl /usr/local/bin/kubectl
       $SUDO chmod +x /usr/local/bin/kubectl
       log  "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/"
@@ -299,7 +301,9 @@ function install_deps_with_yum {
     log "Installing/updating external dependency: kubectl"
     if [[ -z "$(which kubectl)" || "$FORCE" == true ]]; then
       $SUDO sh -c 'printf "[kubernetes]\nname=Kubernetes\nbaseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg\n" > /etc/yum.repos.d/kubernetes.repo'
-      $SUDO yum install -y kubectl
+      local kube_version=$(get_kubectl_version)
+      local kube_yum_version=$(yum --showduplicates list kubectl -y | grep -Eo "($kube_version\-[0-9*])")
+      $SUDO yum install -y kubectl-$kube_yum_version
       log  "Please review any setup requirements for 'kubectl' from: https://kubernetes.io/docs/tasks/tools/install-kubectl/"
     fi
 
@@ -445,6 +449,15 @@ function env_setup {
   fi
 }
 
+function get_kubectl_version {
+  # get supported kubectl versions for IBM Cloud kubernetes clusters
+  local result=$(curl -X GET --header 'Accept: application/json' 'https://containers.cloud.ibm.com/v1/kube-versions' | grep -Eo "\{[^}]*\"default\"\:\s*true[^{]*\}")
+  local major=$( echo $result | grep -Eo \"major\"\:\s*[0-9]* | grep -Eo [0-9]+ )
+  local minor=$( echo $result | grep -Eo \"minor\"\:\s*[0-9]* | grep -Eo [0-9]+ )
+  local patch=$( echo $result | grep -Eo \"patch\"\:\s*[0-9]* | grep -Eo [0-9]+ )
+  echo "$major.$minor.$patch"
+}
+
 #------------------------------------------------------------------------------
 # MAIN
 #------------------------------------------------------------------------------

windows-installer/idt-win-installer.ps1

@@ -179,8 +179,14 @@ function install_deps() {
   log "Checking for external dependency: kubectl"
   if( -not( get-command kubectl -erroraction 'silentlycontinue') -or $Global:FORCE) {
     log "Installing/updating external dependency: kubectl"
-    $kube_version = (Invoke-WebRequest "https://storage.googleapis.com/kubernetes-release/release/stable.txt" -UseBasicParsing).Content
-    $kube_version = $kube_version -replace "`n|`r"
+
+    $response = Invoke-RestMethod "https://containers.cloud.ibm.com/v1/kube-versions" 
+    for ($i = 0; $i -lt $response.Length; $i++){
+        if ($response[$i].default){
+            $kube_version = "v" + $response[$i].major + "." + $response[$i].minor + "."  +$response[$i].patch
+            break
+        }
+    }
     Invoke-WebRequest "https://storage.googleapis.com/kubernetes-release/release/$kube_version/bin/windows/amd64/kubectl.exe" -UseBasicParsing -outfile "kubectl.exe"
     mkdir "C:\Program Files\kubectl" -erroraction 'silentlycontinue'
     Move-Item -Path "kubectl.exe" -Destination "C:\Program Files\kubectl" -force