Merge pull request kubernetes-sigs#573 from CecileRobertMichon/makefile-fixes

Small fixes in Makefile and kind script

Author: k8s-ci-robot

Makefile

@@ -341,7 +341,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
 	@echo 'Set kubectl context to the kind management cluster by running "kubectl config set-context kind-capz"'
 
 .PHONY: create-workload-cluster
-create-workload-cluster: $(KUSTOMIZE) $(ENVSUBST)
+create-workload-cluster: $(ENVSUBST)
 	# Create workload Cluster.
 	$(ENVSUBST) < $(TEMPLATES_DIR)/$(CLUSTER_TEMPLATE) | kubectl apply -f -
 

scripts/kind-with-registry.sh

@@ -14,6 +14,8 @@
 # limitations under the License.
 
 set -o errexit
+set -o nounset
+set -o pipefail
 
 # desired cluster name; default is "kind"
 KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-capz}"