From a456d03621eecc535b409c6d5cb8d18bc8eec291 Mon Sep 17 00:00:00 2001
From: Kevin Leimkuhler <kevin@kleimkuhler.com>
Date: Mon, 7 Dec 2020 11:35:01 -0500
Subject: [PATCH] Change script to work with k3d and install only CLI (#5333)

This changes the install-pr script to work with k3d.

Additionally, it now only installs the CLI; it no longer installs Linkerd on the
cluster. This was removed because most of the time when installing a Linkerd
version from a PR, some extra installation configuration is required and I was
always commenting out that final part of the script.

`--context` was changed to `--cluster` since we no longer need a context value,
only the cluster name which we are loading the images in to.

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
---
 bin/install-pr | 60 ++++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 34 deletions(-)

diff --git a/bin/install-pr b/bin/install-pr
index d536df86b..0fd289d72 100755
--- a/bin/install-pr
+++ b/bin/install-pr
@@ -2,10 +2,12 @@
 
 ### Install PR ###
 #
-# This script takes a Github pull request number as an argument, downloads the
-# docker images from the pull request's artifacts, pushes them, and installs
-# them on your Kubernetes cluster.  Requires a Github personal access token
-# in the $GITHUB_TOKEN environment variable.
+# This script takes a GitHub pull request number as an argument and loads the
+# images into a local Kubernetes cluster. It then installs the CLI so that it
+# can be used to install with any specific configuration needed.
+#
+# It requires a GitHub personal access token in the $GITHUB_TOKEN environment
+# variable.
 
 set -eo pipefail
 
@@ -17,25 +19,31 @@ do
       echo "Install Linkerd with the changes made in a GitHub Pull Request."
       echo ""
       echo "Usage:"
-      echo "    --context: The name of the kubeconfig context to use"
+      echo "    --cluster: The name of the cluster to use"
       echo ""
       echo "    # Install Linkerd into the current cluster"
       echo "    bin/install-pr 1234"
       echo ""
-      echo "    # Install Linkerd into the current KinD cluster"
-      echo "    bin/install-pr [-k|--kind] 1234"
+      echo "    # Install Linkerd into the current k3d cluster"
+      echo "    bin/install-pr --k3d 1234"
       echo ""
-      echo "    # Install Linkerd into the 'kind-pr-1234' KinD cluster"
-      echo "    bin/install-pr [-k|--kind] --context kind-pr-1234 1234"
+      echo "    # Install Linkerd into the current KinD cluster"
+      echo "    bin/install-pr --kind 1234"
+      echo ""
+      echo "    # Install Linkerd into the 'pr-1234' k3d cluster"
+      echo "    bin/install-pr --k3d --cluster pr-1234 1234"
       exit 0
       ;;
-    --context)
-      context=$2
+    --cluster)
+      cluster=$2
       shift
       ;;
-    -k|--kind)
+    --kind)
       is_kind=1
       ;;
+    --k3d)
+      is_k3d=1
+      ;;
     -?*)
       echo "Error: Unknown option: $1" >&2
       exit 1
@@ -87,15 +95,14 @@ echo "### Loading images into Docker ###"
 image=$(docker load -i image-archives/cli-bin.tar | sed 's/Loaded image: //')
 tag=$(echo "$image" | cut -f 2 -d ":")
 
-if [ $is_kind ]
+if [ $is_kind ] || [ $is_k3d ]
 then
-  # KinD context strings are created by prepending `kind-` to the cluster name
-  if [ "$context" ]
+  distro="k3d"
+  if [ $is_kind ]
   then
-    name=$(echo "$context" | sed -n -E "s/(kind)-(.*)/\2/p")
+    distro="kind"
   fi
-
-  "$bindir"/image-load --archive "$name"
+  "$bindir"/image-load --"$distro" --archive "$cluster"
 else
   for image in cni-plugin controller debug grafana proxy web
   do
@@ -122,21 +129,6 @@ esac
 
 linkerd=$("$bindir"/docker-pull-binaries "$tag" | awk -v platform=$platform '$0 ~ platform')
 
-echo "### Pre checks ###"
-
-(
-  set -x
-  "$linkerd" ${context:+'--context' "$context"} check --pre
-)
-
-echo "### Installing $tag ###"
-
-(
-  set -x
-  "$linkerd" ${context:+'--context' "$context"} install | kubectl ${context:+'--context' "$context"} apply -f -
-  "$linkerd" ${context:+'--context' "$context"} check
-)
-
 echo ""
-echo "Linkerd installed. CLI available:"
+echo "Linkerd CLI available:"
 echo "$linkerd"