diff --git a/build/common.sh b/build/common.sh index 6ec69677849..5353c6fc8f2 100755 --- a/build/common.sh +++ b/build/common.sh @@ -955,9 +955,6 @@ function kube::release::package_kube_manifests_tarball() { local objects objects=$(cd "${KUBE_ROOT}/cluster/addons" && find . \( -name \*.yaml -or -name \*.yaml.in -or -name \*.json \) | grep -v demo) tar c -C "${KUBE_ROOT}/cluster/addons" ${objects} | tar x -C "${dst_dir}" - objects=$(cd "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns" && find . \( -name \*.yaml -or -name \*.yaml.in -or -name \*.json \) | grep -v demo) - mkdir -p "${dst_dir}/dns" - tar c -C "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns" ${objects} | tar x -C "${dst_dir}/dns" # This is for coreos only. ContainerVM, GCI, or Trusty does not use it. cp -r "${KUBE_ROOT}/cluster/gce/coreos/kube-manifests"/* "${release_stage}/" diff --git a/build/kube-dns/README.md b/build/kube-dns/README.md index 5d0a918a356..040fef3727b 100644 --- a/build/kube-dns/README.md +++ b/build/kube-dns/README.md @@ -148,8 +148,8 @@ set: ``` Second, you need to start the DNS server ReplicationController and Service. See -the example files ([ReplicationController](../../cluster/saltbase/salt/skydns-rc.yaml.in) and -[Service](../../cluster/saltbase/salt/skydns-svc.yaml.in)), but keep in mind that these are templated for +the example files ([ReplicationController](../../cluster/addns/dns/skydns-rc.yaml.in) and +[Service](../../cluster/addons/dns/skydns-svc.yaml.in)), but keep in mind that these are templated for Salt. You will need to replace the `{{ }}` blocks with your own values for the config variables mentioned above. Other than the templating, these are normal kubernetes objects, and can be instantiated with `kubectl create`. diff --git a/cluster/saltbase/salt/kube-dns/Makefile b/cluster/addons/dns/Makefile similarity index 100% rename from cluster/saltbase/salt/kube-dns/Makefile rename to cluster/addons/dns/Makefile diff --git a/cluster/saltbase/salt/kube-dns/README.md b/cluster/addons/dns/README.md similarity index 94% rename from cluster/saltbase/salt/kube-dns/README.md rename to cluster/addons/dns/README.md index c658f26663f..faf56c79d64 100644 --- a/cluster/saltbase/salt/kube-dns/README.md +++ b/cluster/addons/dns/README.md @@ -33,4 +33,4 @@ skydns-svc.yaml.in skydns-rc.yaml.sed skydns-svc.yaml.sed -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/saltbase/salt/kube-dns/README.md?pixel)]() +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/dns/README.md?pixel)]() diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base b/cluster/addons/dns/skydns-rc.yaml.base similarity index 100% rename from cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base rename to cluster/addons/dns/skydns-rc.yaml.base diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in similarity index 100% rename from cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in rename to cluster/addons/dns/skydns-rc.yaml.in diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed b/cluster/addons/dns/skydns-rc.yaml.sed similarity index 100% rename from cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed rename to cluster/addons/dns/skydns-rc.yaml.sed diff --git a/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.base b/cluster/addons/dns/skydns-svc.yaml.base similarity index 100% rename from cluster/saltbase/salt/kube-dns/skydns-svc.yaml.base rename to cluster/addons/dns/skydns-svc.yaml.base diff --git a/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in b/cluster/addons/dns/skydns-svc.yaml.in similarity index 100% rename from cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in rename to cluster/addons/dns/skydns-svc.yaml.in diff --git a/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.sed b/cluster/addons/dns/skydns-svc.yaml.sed similarity index 100% rename from cluster/saltbase/salt/kube-dns/skydns-svc.yaml.sed rename to cluster/addons/dns/skydns-svc.yaml.sed diff --git a/cluster/saltbase/salt/kube-dns/transforms2salt.sed b/cluster/addons/dns/transforms2salt.sed similarity index 100% rename from cluster/saltbase/salt/kube-dns/transforms2salt.sed rename to cluster/addons/dns/transforms2salt.sed diff --git a/cluster/saltbase/salt/kube-dns/transforms2sed.sed b/cluster/addons/dns/transforms2sed.sed similarity index 100% rename from cluster/saltbase/salt/kube-dns/transforms2sed.sed rename to cluster/addons/dns/transforms2sed.sed diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index da770ff894d..204c5f422b3 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -57,8 +57,8 @@ endif mkdir -p ${TEMP_DIR}/cni ${TEMP_DIR}/addons cp ../../saltbase/salt/helpers/safe_format_and_mount ${TEMP_DIR} cp ../../saltbase/salt/generate-cert/make-ca-cert.sh ${TEMP_DIR} - cp ../../saltbase/salt/kube-dns/skydns-rc.yaml.base ${TEMP_DIR}/addons/skydns-rc.yaml - cp ../../saltbase/salt/kube-dns/skydns-svc.yaml.base ${TEMP_DIR}/addons/skydns-svc.yaml + cp ../../addons/dns/skydns-rc.yaml.base ${TEMP_DIR}/addons/skydns-rc.yaml + cp ../../addons/dns/skydns-svc.yaml.base ${TEMP_DIR}/addons/skydns-svc.yaml cp ../../addons/dashboard/dashboard-controller.yaml ${TEMP_DIR}/addons cp ../../addons/dashboard/dashboard-service.yaml ${TEMP_DIR}/addons diff --git a/cluster/mesos/docker/deploy-dns.sh b/cluster/mesos/docker/deploy-dns.sh index d1b99f0fecd..cbe650a4fd4 100755 --- a/cluster/mesos/docker/deploy-dns.sh +++ b/cluster/mesos/docker/deploy-dns.sh @@ -28,8 +28,8 @@ kubectl="${KUBE_ROOT}/cluster/kubectl.sh" workspace=$(pwd) # Process salt pillar templates manually -sed -e "s/{{ pillar\['dns_replicas'\] }}/${DNS_REPLICAS}/g;s/{{ pillar\['dns_domain'\] }}/${DNS_DOMAIN}/g" "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in" > "${workspace}/skydns-rc.yaml" -sed -e "s/{{ pillar\['dns_server'\] }}/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in" > "${workspace}/skydns-svc.yaml" +sed -e "s/{{ pillar\['dns_replicas'\] }}/${DNS_REPLICAS}/g;s/{{ pillar\['dns_domain'\] }}/${DNS_DOMAIN}/g" "${KUBE_ROOT}/cluster/addons/dns/skydns-rc.yaml.in" > "${workspace}/skydns-rc.yaml" +sed -e "s/{{ pillar\['dns_server'\] }}/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/addons/dns/skydns-svc.yaml.in" > "${workspace}/skydns-svc.yaml" # Federation specific values. if [[ "${FEDERATION:-}" == "true" ]]; then diff --git a/cluster/saltbase/salt/kube-addons/init.sls b/cluster/saltbase/salt/kube-addons/init.sls index 4f531643db5..ae8f1dfd36a 100644 --- a/cluster/saltbase/salt/kube-addons/init.sls +++ b/cluster/saltbase/salt/kube-addons/init.sls @@ -75,7 +75,7 @@ addon-dir-create: {% if pillar.get('enable_cluster_dns', '').lower() == 'true' %} /etc/kubernetes/addons/dns/skydns-svc.yaml: file.managed: - - source: salt://kube-dns/skydns-svc.yaml.in + - source: salt://kube-addons/dns/skydns-svc.yaml.in - template: jinja - group: root - dir_mode: 755 @@ -83,7 +83,7 @@ addon-dir-create: /etc/kubernetes/addons/dns/skydns-rc.yaml: file.managed: - - source: salt://kube-dns/skydns-rc.yaml.in + - source: salt://kube-addons/dns/skydns-rc.yaml.in - template: jinja - group: root - dir_mode: 755 diff --git a/cluster/ubuntu/deployAddons.sh b/cluster/ubuntu/deployAddons.sh index 591b576e033..245f91ed0e2 100755 --- a/cluster/ubuntu/deployAddons.sh +++ b/cluster/ubuntu/deployAddons.sh @@ -41,8 +41,8 @@ function init { function deploy_dns { echo "Deploying DNS on Kubernetes" - sed -e "s/\\\$DNS_REPLICAS/${DNS_REPLICAS}/g;s/\\\$DNS_DOMAIN/${DNS_DOMAIN}/g;" "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed" > skydns-rc.yaml - sed -e "s/\\\$DNS_SERVER_IP/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.sed" > skydns-svc.yaml + sed -e "s/\\\$DNS_REPLICAS/${DNS_REPLICAS}/g;s/\\\$DNS_DOMAIN/${DNS_DOMAIN}/g;" "${KUBE_ROOT}/cluster/addons/dns/skydns-rc.yaml.sed" > skydns-rc.yaml + sed -e "s/\\\$DNS_SERVER_IP/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/addons/dns/skydns-svc.yaml.sed" > skydns-svc.yaml KUBEDNS=`eval "${KUBECTL} get services --namespace=kube-system | grep kube-dns | cat"` diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index aa99c6aaffc..af038aa7b7b 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -409,7 +409,7 @@ function start_kubedns { if [[ "${ENABLE_CLUSTER_DNS}" = true ]]; then echo "Creating kube-system namespace" - sed -e "s/{{ pillar\['dns_replicas'\] }}/${DNS_REPLICAS}/g;s/{{ pillar\['dns_domain'\] }}/${DNS_DOMAIN}/g;" "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in" >| skydns-rc.yaml + sed -e "s/{{ pillar\['dns_replicas'\] }}/${DNS_REPLICAS}/g;s/{{ pillar\['dns_domain'\] }}/${DNS_DOMAIN}/g;" "${KUBE_ROOT}/cluster/addons/dns/skydns-rc.yaml.in" >| skydns-rc.yaml if [[ "${FEDERATION:-}" == "true" ]]; then FEDERATIONS_DOMAIN_MAP="${FEDERATIONS_DOMAIN_MAP:-}" if [[ -z "${FEDERATIONS_DOMAIN_MAP}" && -n "${FEDERATION_NAME:-}" && -n "${DNS_ZONE_NAME:-}" ]]; then @@ -423,7 +423,7 @@ function start_kubedns { else sed -i -e "/{{ pillar\['federations_domain_map'\] }}/d" skydns-rc.yaml fi - sed -e "s/{{ pillar\['dns_server'\] }}/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in" >| skydns-svc.yaml + sed -e "s/{{ pillar\['dns_server'\] }}/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/addons/dns/skydns-svc.yaml.in" >| skydns-svc.yaml cat <namespace.yaml apiVersion: v1 kind: Namespace