Merge "Replace flannel with calico"

diff --git a/deploy/kata/kata.sh b/deploy/kata/kata.sh
index 187e539..967a891 100755 (executable)
--- a/deploy/kata/kata.sh
+++ b/deploy/kata/kata.sh
@@ -37,6 +37,7 @@ function deploy_webhook {
     # create-certs.sh takes care of converting the .yaml.tpl into the
     # .yaml file
     mkdir -p ${BUILDDIR}/webhook/base/deploy
+    curl -sL ${KATA_WEBHOOK_URL}/common.bash -o ${BUILDDIR}/webhook/base/common.bash
     curl -sL ${KATA_WEBHOOK_URL}/create-certs.sh -o ${BUILDDIR}/webhook/base/create-certs.sh
     curl -sL ${KATA_WEBHOOK_URL}/deploy/webhook-registration.yaml.tpl -o ${BUILDDIR}/webhook/base/deploy/webhook-registration.yaml.tpl
     curl -sL ${KATA_WEBHOOK_URL}/deploy/webhook.yaml -o ${BUILDDIR}/webhook/base/deploy/webhook.yaml

diff --git a/deploy/site/pod11/pod11.sh b/deploy/site/pod11/pod11.sh
old mode 100644 (file)
new mode 100755 (executable)