Merge pull request #5 from tamer-hassan/macos-improved-support

Fixes Issue #4

kind-registry.sh

@@ -1,13 +1,21 @@
 #!/bin/bash
 
+# Workaround for MacOS when kind-control-plane container is not started after reboot
+name='kind-control-plane'
+if [ -z "`docker ps --format '{{.Names}}' | grep $name`" ] && [ "`docker ps -a --format '{{.Names}}' | grep $name`" == "$name" ]; then
+    echo "Found $name container but stopped, so starting it, and sleeping 15s!"
+	docker start $name
+    sleep 15
+fi
+
 # set up kubeconfig to point to the kind cluster
 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
 
 nodes=$(kubectl get nodes -oname)
-num_nodes=$(echo "$nodes" | wc -l)
+num_nodes=$(echo "$nodes" | wc -l | sed 's/^ *//')
 
 # double-check that we have a 1-node cluster
-if [[ "1" != $num_nodes ]]; then
+if [[ "1" != "$num_nodes" ]]; then
     echo "Required: KIND cluster with exactly 1 node. Actual: $num_nodes"
     exit 1
 fi
@@ -16,11 +24,13 @@ fi
 for node in $(kubectl get nodes -oname); do
     node_name=${node#node/}
 
+    echo "node_name: ${node_name}"
+
     # Check to see if containerd is set up already with an insecure registry
     config=$(docker exec ${node_name} cat /etc/containerd/config.toml)
     if [[ "$config" != *"localhost:32001"* ]]; then
         echo "Overwriting /etc/containerd/config.toml"
-    
+
         # Overwrite config.toml with our own
         docker cp config.toml ${node_name}:/etc/containerd/config.toml