Fix link to DNS yaml definitions, Closes #3

skippbox · Jul 12, 2016 · 8b7ee9f · 8b7ee9f
1 parent f7415f6
commit 8b7ee9f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/deploy-addons.sh b/deploy-addons.sh
@@ -30,7 +30,6 @@ DNS_SERVER_IP="10.0.0.10"
 DNS_DOMAIN="cluster.local"
 DNS_REPLICAS=1
 ENABLE_CLUSTER_UI=true
-ENABLE_DM=true
 
 KUBE_ROOT="https://raw.githubusercontent.com/kubernetes/kubernetes/master"
 bin="$(cd "$(dirname "${BASH_SOURCE}")" && pwd -P)"
@@ -50,9 +49,3 @@ if [ "${ENABLE_CLUSTER_UI}" == "true" ]; then
   echo "Deploying UI Addon" 1>&2
   "${bin}/deploy-ui.sh"
 fi
-
-if [ "${ENABLE_DM}" == "true" ]; then
-  echo "Deploying DM" 1>&2
-  curl -s https://raw.githubusercontent.com/kubernetes/deployment-manager/master/get-install.sh | sh
-fi
-
diff --git a/deploy-dns.sh b/deploy-dns.sh
@@ -29,8 +29,8 @@ DNS_REPLICAS=1
 
 workspace=$(pwd)
 
-curl -O ${KUBE_ROOT}/cluster/addons/dns/skydns-rc.yaml.in
-curl -O ${KUBE_ROOT}/cluster/addons/dns/skydns-svc.yaml.in
+curl -O ${KUBE_ROOT}/saltbase/salt/kube-dns/skydns-rc.yaml.in
+curl -O ${KUBE_ROOT}/saltbase/salt/kube-dns/skydns-svc.yaml.in
 
 # Process salt pillar templates manually
 sed -e "s/{{ pillar\['dns_replicas'\] }}/${DNS_REPLICAS}/g;s/{{ pillar\['dns_domain'\] }}/${DNS_DOMAIN}/g" "skydns-rc.yaml.in" > "${workspace}/skydns-rc.yaml"

diff --git a/deploy-ui.sh b/deploy-ui.sh
@@ -21,7 +21,7 @@ set -o nounset
 set -o pipefail
 set -o errtrace
 
-KUBE_ROOT="https://raw.githubusercontent.com/kubernetes/kubernetes/master"
+KUBE_ROOT="https://raw.githubusercontent.com/skippbox/configk8s/master"
 
-kubectl create -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-controller.yaml"
-kubectl create -f "${KUBE_ROOT}/cluster/addons/dashboard/dashboard-service.yaml"
+kubectl create -f "${KUBE_ROOT}/json/dashboard-controller.yaml"
+kubectl create -f "${KUBE_ROOT}/json/dashboard-service.yaml"