From 96f3b99c7a06ef2557da7ce8d62597ca0c7e3b3d Mon Sep 17 00:00:00 2001
From: Brandon Wilson <brandon@coil.com>
Date: Fri, 3 Apr 2020 12:33:10 -0500
Subject: [PATCH] kata-deploy: fix k3s containerd check

The default k3s containerRuntimeVersion takes the form of:
containerd://1.3.3-k3s2

The awk was stripping away the k3s portion before checking if it was a
k3s containerd.

fixes #996

Signed-off-by: Brandon Wilson <brandon@coil.com>
---
 kata-deploy/scripts/kata-deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kata-deploy/scripts/kata-deploy.sh b/kata-deploy/scripts/kata-deploy.sh
index b1f952de40..c649d1d3ef 100755
--- a/kata-deploy/scripts/kata-deploy.sh
+++ b/kata-deploy/scripts/kata-deploy.sh
@@ -33,7 +33,7 @@ function print_usage() {
 
 function get_container_runtime() {
 
-	local runtime=$(kubectl get node $NODE_NAME -o jsonpath='{.status.nodeInfo.containerRuntimeVersion}' | awk -F '[:]' '{print $1}')
+	local runtime=$(kubectl get node $NODE_NAME -o jsonpath='{.status.nodeInfo.containerRuntimeVersion}')
 	if [ "$?" -ne 0 ]; then
                 die "invalid node name"
 	fi
@@ -44,7 +44,7 @@ function get_container_runtime() {
 			echo "k3s"
 		fi
 	else
-		echo "$runtime"
+		echo "$runtime" | awk -F '[:]' '{print $1}'
 	fi
 }