Merge pull request #26335 from girishkalele/kubedns-transition

CHANGELOG.md

@@ -547,7 +547,7 @@ hint to the scheduler; the scheduler will try to satisfy these requests but it
 does not guarantee they will be satisfied. Both the “hard” and “soft” variants
 of node affinity use the new syntax. Documentation is [here](http://kubernetes.io/docs/user-guide/node-selection/) (see section “Alpha feature in Kubernetes v1.2: Node Affinity“). Design doc is [here](https://github.com/kubernetes/kubernetes/blob/release-1.2/docs/design/nodeaffinity.md).
   * A pod can specify its own Hostname and Subdomain via annotations (<code>pod.beta.kubernetes.io/hostname, pod.beta.kubernetes.io/subdomain)</code>. If the Subdomain matches the name of a [headless service](http://kubernetes.io/docs/user-guide/services/#headless-services) in the same namespace, a DNS A record is also created for the pod’s FQDN. More
-details can be found in the [DNS README](https://github.com/kubernetes/kubernetes/blob/release-1.2/cluster/addons/dns/README.md#a-records-and-hostname-based-on-pod-annotations---a-beta-feature-in-kubernetes-v12). Changes were introduced in PR [#20688](https://github.com/kubernetes/kubernetes/pull/20688).
+details can be found in the [DNS README](https://github.com/kubernetes/kubernetes/blob/release-1.2/cluster/saltbase/salt/kube-dns/README.md#a-records-and-hostname-based-on-pod-annotations---a-beta-feature-in-kubernetes-v12). Changes were introduced in PR [#20688](https://github.com/kubernetes/kubernetes/pull/20688).
   * New SchedulerExtender enables users to implement custom
 out-of-(the-scheduler)-process scheduling predicates and priority functions,
 for example to schedule pods based on resources that are not directly managed

build/common.sh

@@ -934,6 +934,9 @@ 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}/"

build/kube-dns/Changelog

+## Version 1.2 (Fri May 27 2016 Tim Hockin <thockin@google.com>)
+ - First Changelog entry

cluster/addons/dns/MAINTAINERS.md → build/kube-dns/MAINTAINERS.md

@@ -2,5 +2,4 @@
 
 Tim Hockin <thockin@google.com>
 
-
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/dns/MAINTAINERS.md?pixel)]()
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/kube-dns/MAINTAINERS.md?pixel)]()

build/kube-dns/Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Makefile for the Docker image gcr.io/google_containers/kube2sky
+# Makefile for the Docker image gcr.io/google_containers/kubedns-<ARCH>
 # MAINTAINER: Tim Hockin <thockin@google.com>
 # If you update this image please bump the tag value before pushing.
 #
@@ -22,7 +22,7 @@
 # Default registry, arch and tag. This can be overwritten by arguments to make
 PLATFORM?=linux
 ARCH?=amd64
-TAG?=1.1
+TAG?=1.2
 REGISTRY?=gcr.io/google_containers
 
 GOLANG_VERSION=1.6
@@ -48,7 +48,7 @@ all: container
 
 container:
 	# Copy the content in this dir to the temp dir
-	cp $(KUBE_ROOT)/_output/local/bin/$(PLATFORM)/$(ARCH)/kube-dns $(TEMP_DIR)
+	cp $(KUBE_ROOT)/_output/dockerized/bin/$(PLATFORM)/$(ARCH)/kube-dns $(TEMP_DIR)
 	cp $(KUBE_ROOT)/build/kube-dns/Dockerfile $(TEMP_DIR)
 
 	# Replace BASEIMAGE with the real base image

cluster/addons/dns/README.md → 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](skydns-rc.yaml.in) and
-[Service](skydns-svc.yaml.in)), but keep in mind that these are templated for
+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
 Salt.  You will need to replace the `{{ <param> }}` 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`.
@@ -217,14 +217,14 @@ If you see that, DNS is working correctly.
 
 
 ## How does it work?
-SkyDNS depends on etcd for what to serve, but it doesn't really need all of
+<del>SkyDNS depends on etcd for what to serve, but it doesn't really need all of
 what etcd offers (at least not in the way we use it).  For simplicity, we run
 etcd and SkyDNS together in a pod, and we do not try to link etcd instances
 across replicas.  A helper container called [kube2sky](kube2sky/) also runs in
 the pod and acts a bridge between Kubernetes and SkyDNS.  It finds the
 Kubernetes master through the `kubernetes` service (via environment
 variables), pulls service info from the master, and writes that to etcd for
-SkyDNS to find.
+SkyDNS to find.</del>
 
 ## Inheriting DNS from the node
 When running a pod, kubelet will prepend the cluster DNS server and search
@@ -252,11 +252,14 @@ some of those settings will be lost.  As a partial workaround, the node can run
 entries.  You can also use kubelet's `--resolv-conf` flag.
 
 ## Making changes
-Please observe the release process for making changes to the `kube2sky`
-image that is documented in [RELEASES.md](kube2sky/RELEASES.md). Any significant changes
-to the YAML template for `kube-dns` should result a bump of the version number
-for the `kube-dns` replication controller and well as the `version` label. This
-will permit a rolling update of `kube-dns`.
+The container containing the kube-dns binary needs to be built for every
+architecture and pushed to the registry manually whenever the kube-dns binary
+has code changes. Every significant change to the functionality should result
+in a bump of the TAG in the Makefile.
 
+Any significant changes to the YAML template for `kube-dns` should result a bump
+of the version number for the `kube-dns` replication controller and well as the
+`version` label. This will permit a rolling update of `kube-dns`.
 
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/dns/README.md?pixel)]()
+
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/kube-dns/README.md?pixel)]()

cluster/addons/dns/kube2sky/RELEASES.md → build/kube-dns/RELEASES.md

@@ -4,7 +4,11 @@ Until we have a proper setup for building this automatically with every binary
 release, here are the steps for making a release. We make releases when they
 are ready, not on every PR.
 
-1. Build the container for testing: `make container PREFIX=<your-docker-hub> TAG=rc`
+1. Build the container for testing: 
+
+`make release`
+`cd build/kube-dns`
+`make container PREFIX=<your-docker-hub> TAG=rc`
 
 2. Manually deploy this to your own cluster by updating the replication
    controller and deleting the running pod(s).
@@ -19,17 +23,17 @@ are ready, not on every PR.
 	```console
 	# Build for linux/amd64 (default)
 	$ make push ARCH=amd64
-	# ---> gcr.io/google_containers/kube2sky-amd64:TAG
-	# ---> gcr.io/google_containers/kube2sky:TAG (image with backwards-compatible naming)
+	# ---> gcr.io/google_containers/kube-dns-amd64:TAG
+	# ---> gcr.io/google_containers/kube-dns:TAG (image with backwards-compatible naming)
 
 	$ make push ARCH=arm
-	# ---> gcr.io/google_containers/kube2sky-arm:TAG
+	# ---> gcr.io/google_containers/kube-dns-arm:TAG
 
 	$ make push ARCH=arm64
-	# ---> gcr.io/google_containers/kube2sky-arm64:TAG
+	# ---> gcr.io/google_containers/kube-dns-arm64:TAG
 
 	$ make push ARCH=ppc64le
-	# ---> gcr.io/google_containers/kube2sky-ppc64le:TAG
+	# ---> gcr.io/google_containers/kube-dns-ppc64le:TAG
 	```
 
 6. Manually deploy this to your own cluster by updating the replication
@@ -40,4 +44,4 @@ are ready, not on every PR.
 8. Allow the PR to be merged.
 
 
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/dns/kube2sky/RELEASES.md?pixel)]()
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/kube-dns/RELEASES.md?pixel)]()

cluster/addons/dns/kube2sky/.gitignore

-kube2sky

cluster/addons/dns/kube2sky/Changelog

-## Version 1.15 (Apr 7 2016 Lucas Käldström <lucas.kaldstrom@hotmail.co.uk>)
- - No code changes since 1.14
- - Built in a dockerized env instead of using go on host to make it more reliable. `1.15` was built with `go1.6`
- - Made it possible to compile this image for multiple architectures, so the main naming of this image is 
-   now `gcr.io/google_containers/kube2sky-arch:tag`. `arch` may be one of `amd64`, `arm`, `arm64` or `ppc64le`.
-   `gcr.io/google_containers/kube2sky:tag` is still pushed for backward compability
-
-## Version 1.14 (Mar 4 2016 Abhishek Shah <abshah@google.com>)
-- If Endpoint has hostnames-map annotation (endpoints.net.beta.kubernetes.io/hostnames-map),
-  the hostnames supplied via the annotation will be used to generate A Records for Headless Service.
-
-## Version 1.13 (Mar 1 2016 Prashanth.B <beeps@google.com>)
-- Synchronously wait for the Kubernetes service at startup.
-- Add a SIGTERM/SIGINT handler.
-
-## Version 1.12 (Dec 15 2015 Abhishek Shah <abshah@google.com>)
-- Gave pods their own cache store. (034ecbd)
-- Allow pods to have dns. (717660a)
-
-
-## Version 1.10 (Jun 19 2015 Tim Hockin <thockin@google.com>)
-- Fall back on service account tokens if no other auth is specified.
-
-
-## Version 1.9 (May 28 2015 Abhishek Shah <abshah@google.com>)
-- Add SRV support.
-
-
-## Version 1.8 (May 28 2015 Vishnu Kannan <vishnuk@google.com>)
-- Avoid making connections to the master insecure by default
-- Let users override the master URL in kubeconfig via a flag
-
-
-## Version 1.7 (May 25 2015 Vishnu Kannan <vishnuk@google.com>)
-- Adding support for headless services. All pods backing a headless service is
-addressible via DNS RR.
-
-
-## Version 1.4 (Fri May 15 2015 Tim Hockin <thockin@google.com>)
-- First Changelog entry

cluster/addons/dns/kube2sky/Dockerfile

-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM BASEIMAGE
-MAINTAINER Tim Hockin <thockin@google.com>
-ADD kube2sky /
-ADD kube2sky.go /
-ENTRYPOINT ["/kube2sky"]

cluster/addons/dns/kube2sky/Makefile

-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Makefile for the Docker image gcr.io/google_containers/kube2sky
-# MAINTAINER: Tim Hockin <thockin@google.com>
-# If you update this image please bump the tag value before pushing.
-#
-# Usage:
-#   [ARCH=amd64] [TAG=1.14] [REGISTRY=gcr.io/google_containers] [BASEIMAGE=busybox] make (build|push)
-
-# Default registry, arch and tag. This can be overwritten by arguments to make
-ARCH?=amd64
-TAG?=1.15
-REGISTRY?=gcr.io/google_containers
-GOLANG_VERSION=1.6
-GOARM=6
-KUBE_ROOT=$(shell pwd)/../../../..
-TEMP_DIR:=$(shell mktemp -d)
-
-ifeq ($(ARCH),amd64)
-	BASEIMAGE?=busybox
-endif
-ifeq ($(ARCH),arm)
-	BASEIMAGE?=armel/busybox
-endif
-ifeq ($(ARCH),arm64)
-	BASEIMAGE?=aarch64/busybox
-endif
-ifeq ($(ARCH),ppc64le)
-	BASEIMAGE?=ppc64le/busybox
-endif
-
-
-all: container
-
-kube2sky: kube2sky.go
-	# Only build kube2sky. This requires go and godep in PATH
-	CGO_ENABLED=0 GOARCH=$(ARCH) GOARM=$(GOARM) go build -a -installsuffix cgo --ldflags '-w' ./kube2sky.go
-
-container:
-	# Copy the content in this dir to the temp dir
-	cp ./* $(TEMP_DIR)
-
-	# Build the binary dockerized. Mount the whole Kubernetes source first, and then the temporary dir to kube2sky source.
-	# It runs "make kube2sky" inside the docker container, and the binary is put in the temporary dir.
-	docker run -it \
-		-v $(KUBE_ROOT):/go/src/k8s.io/kubernetes \
-		-v $(TEMP_DIR):/go/src/k8s.io/kubernetes/cluster/addons/dns/kube2sky \
-		golang:$(GOLANG_VERSION) /bin/bash -c \
-		"go get github.com/tools/godep \
-		&& make -C /go/src/k8s.io/kubernetes/cluster/addons/dns/kube2sky kube2sky ARCH=$(ARCH)"
-
-	# Replace BASEIMAGE with the real base image
-	cd $(TEMP_DIR) && sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
-
-	# And build the image
-	docker build -t $(REGISTRY)/kube2sky-$(ARCH):$(TAG) $(TEMP_DIR)
-
-push: container
-	gcloud docker push $(REGISTRY)/kube2sky-$(ARCH):$(TAG)
-
-ifeq ($(ARCH),amd64)
-	# Backward compatability. TODO: deprecate this image tag
-	docker tag -f $(REGISTRY)/kube2sky-$(ARCH):$(TAG) $(REGISTRY)/kube2sky:$(TAG)
-	gcloud docker push $(REGISTRY)/kube2sky:$(TAG)
-endif
-
-clean:
-	rm -f kube2sky
-
-test: clean
-	go test -v --vmodule=*=4
-
-
-.PHONY: all kube2sky container push clean test

cluster/addons/dns/kube2sky/README.md

-# kube2sky
-==============
-
-A bridge between Kubernetes and SkyDNS.  This will watch the kubernetes API for
-changes in Services and then publish those changes to SkyDNS through etcd.
-
-For now, this is expected to be run in a pod alongside the etcd and SkyDNS
-containers.
-
-## Namespaces
-
-Kubernetes namespaces become another level of the DNS hierarchy.  See the
-description of `--domain` below.
-
-## Flags
-
-`--domain`: Set the domain under which all DNS names will be hosted.  For
-example, if this is set to `kubernetes.io`, then a service named "nifty" in the
-"default" namespace would be exposed through DNS as
-"nifty.default.svc.kubernetes.io".
-
-`--v`: Set logging level
-
-`--etcd-mutation-timeout`: For how long the application will keep retrying etcd
-mutation (insertion or removal of a dns entry) before giving up and crashing.
-
-`--etcd-server`: The etcd server that is being used by skydns.
-
-`--kube-master-url`: URL of kubernetes master. Required if `--kubecfg_file` is not set.
-
-`--kubecfg-file`: Path to kubecfg file that contains the master URL and tokens to authenticate with the master.
-
-`--log-dir`: If non empty, write log files in this directory
-
-`--logtostderr`: Logs to stderr instead of files
-
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/dns/kube2sky/README.md?pixel)]()

cluster/addons/dns/skydns/Makefile

-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Build skydns
-#
-# Usage:
-#   [ARCH=amd64] [TAG=1.0] [REGISTRY=gcr.io/google_containers] [BASEIMAGE=busybox] make (build|push)
-
-# Default registry and arch. This can be overwritten by arguments to make
-ARCH?=amd64
-
-# Version of this image, not the version of skydns
-TAG=1.0
-REGISTRY?=gcr.io/google_containers
-GOLANG_VERSION=1.6
-GOARM=6
-TEMP_DIR:=$(shell mktemp -d)
-
-ifeq ($(ARCH),amd64)
-	BASEIMAGE?=busybox
-	GOBIN_DIR=/go/bin/
-else
-	# If not the GOARCH == the host arch, the binary directory is here
-	GOBIN_DIR=/go/bin/linux_$(ARCH)
-endif
-
-ifeq ($(ARCH),arm)
-	BASEIMAGE?=armel/busybox
-endif
-ifeq ($(ARCH),arm64)
-	BASEIMAGE?=aarch64/busybox
-endif
-ifeq ($(ARCH),ppc64le)
-	BASEIMAGE?=ppc64le/busybox
-endif
-
-# Do not change this default value
-all: skydns
-
-skydns:
-	# Only build skydns. This requires go in PATH
-	CGO_ENABLED=0 GOARCH=$(ARCH) GOARM=$(GOARM) go get -a -installsuffix cgo --ldflags '-w' github.com/skynetservices/skydns
-
-container:
-	# Copy the content in this dir to the temp dir
-	cp ./* $(TEMP_DIR)
-
-	# Build skydns in a container. We mount the temporary dir
-	docker run -it -v $(TEMP_DIR):$(GOBIN_DIR) golang:$(GOLANG_VERSION) /bin/bash -c "make -C $(GOBIN_DIR) skydns ARCH=$(ARCH)"
-
-	# Replace BASEIMAGE with the real base image
-	cd $(TEMP_DIR) && sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
-
-	# And build the image
-	docker build -t $(REGISTRY)/skydns-$(ARCH):$(TAG) $(TEMP_DIR)
-
-push: container
-	gcloud docker push $(REGISTRY)/skydns-$(ARCH):$(TAG)
-
-ifeq ($(ARCH),amd64)
-	# Backward compatability. TODO: deprecate this image tag
-	docker tag -f $(REGISTRY)/skydns-$(ARCH):$(TAG) $(REGISTRY)/skydns:$(TAG)
-	gcloud docker push $(REGISTRY)/skydns:$(TAG)
-endif
-
-clean:
-	rm -f skydns

cluster/addons/dns/skydns/README.md

-# skydns for kubernetes
-=======================
-
-This container only exists until skydns itself is reduced in some way. At the
-time of this writing, it is over 600 MB large.
-
-#### How to release
-
-This image is compiled for multiple architectures.
-If you're rebuilding the image, please bump the `TAG` in the Makefile.
-
-```console
-# Build for linux/amd64 (default)
-$ make push ARCH=amd64
-# ---> gcr.io/google_containers/skydns-amd64:TAG
-# ---> gcr.io/google_containers/skydns:TAG (image with backwards-compatible naming)
-
-$ make push ARCH=arm
-# ---> gcr.io/google_containers/skydns-arm:TAG
-
-$ make push ARCH=arm64
-# ---> gcr.io/google_containers/skydns-arm64:TAG
-
-$ make push ARCH=ppc64le
-# ---> gcr.io/google_containers/skydns-ppc64le:TAG
-```
-
-If you don't want to push the images, run `make` or `make build` instead
-
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/dns/skydns/README.md?pixel)]()

cluster/images/hyperkube/addons/dns-rc.yaml

@@ -12,32 +12,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file should be kept in sync with cluster/addons/dns/skydns-rc.yaml.in
+# This file should be kept in sync with cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-dns-v11
+  name: kube-dns-v13
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v11
+    version: v13
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: kube-dns
-    version: v11
+    version: v13
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v11
+        version: v13
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-      - name: etcd
+      - name: kubedns
         # ARCH will be replaced with the architecture it's built for. Check out the Makefile for more details
-        image: gcr.io/google_containers/etcd-ARCH:2.2.5
+        image: gcr.io/google_containers/kubedns-ARCH:1.2
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -45,33 +45,6 @@ spec:
           # "burstable" category so the kubelet doesn't backoff from restarting it.
           limits:
             cpu: 100m
-            memory: 500Mi
-          requests:
-            cpu: 100m
-            memory: 50Mi
-        command:
-        - /usr/local/bin/etcd
-        - -data-dir
-        - /var/etcd/data
-        - -listen-client-urls
-        - http://127.0.0.1:2379,http://127.0.0.1:4001
-        - -advertise-client-urls
-        - http://127.0.0.1:2379,http://127.0.0.1:4001
-        - -initial-cluster-token
-        - skydns-etcd
-        volumeMounts:
-        - name: etcd-storage
-          mountPath: /var/etcd/data
-      - name: kube2sky
-        image: gcr.io/google_containers/kube2sky-ARCH:1.15
-        resources:
-          # TODO: Set memory limits when we've profiled the container for large
-          # clusters, then set request = limit to keep this container in
-          # guaranteed class. Currently, this container falls into the
-          # "burstable" category so the kubelet doesn't backoff from restarting it.
-          limits:
-            cpu: 100m
-            # Kube2sky watches all pods.
             memory: 200Mi
           requests:
             cpu: 100m
@@ -95,26 +68,22 @@ spec:
           initialDelaySeconds: 30
           timeoutSeconds: 5
         args:
-        # command = "/kube2sky"
+        # command = "/kube-dns"
         - --domain=cluster.local
-      - name: skydns
-        image: gcr.io/google_containers/skydns-ARCH:1.0
-        resources:
-          # TODO: Set memory limits when we've profiled the container for large
-          # clusters, then set request = limit to keep this container in
-          # guaranteed class. Currently, this container falls into the
-          # "burstable" category so the kubelet doesn't backoff from restarting it.
-          limits:
-            cpu: 100m
-            memory: 200Mi
-          requests:
-            cpu: 100m
-            memory: 50Mi
+        - --dns-port=10053
+        ports:
+        - containerPort: 10053
+          name: dns-local
+          protocol: UDP
+        - containerPort: 10053
+          name: dns-tcp-local
+          protocol: TCP
+      - name: dnsmasq
+        image: gcr.io/google_containers/dnsmasq-ARCH:1.1
         args:
-        - -machines=http://127.0.0.1:4001
-        - -addr=0.0.0.0:53
-        - -ns-rotate=false
-        - -domain=cluster.local.
+        - --cache-size=1000
+        - --no-resolv
+        - --server=127.0.0.1#10053
         ports:
         - containerPort: 53
           name: dns
@@ -138,7 +107,4 @@ spec:
         ports:
         - containerPort: 8080
           protocol: TCP
-      volumes:
-      - name: etcd-storage
-        emptyDir: {}
       dnsPolicy: Default  # Don't use cluster DNS.

cluster/images/hyperkube/addons/dns-svc.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file should be kept in sync with cluster/addons/dns/skydns-svc.yaml.in
+# This file should be kept in sync with cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in
 apiVersion: v1
 kind: Service
 metadata:

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/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"
+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"
 
 # Use kubectl to create skydns rc and service
 "${kubectl}" create -f "${workspace}/skydns-rc.yaml"

cluster/addons/dns/skydns/Dockerfile → cluster/saltbase/salt/kube-dns/Makefile

@@ -12,7 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM BASEIMAGE
-MAINTAINER Tim Hockin <thockin@google.com>
-ADD skydns /
-ENTRYPOINT ["/skydns"]
+# Makefile for the skydns underscore templates to Salt/Pillar and other formats.
+
+# If you update the *.base templates, please run this Makefile before pushing.
+#
+# Usage:
+#    make
+
+all: transform
+
+# .base -> .in pattern rule
+%.in: %.base
+	sed -f transforms2salt.sed $< | sed s/__SOURCE_FILENAME__/$</g > $@
+
+# .base -> .sed pattern rule
+%.sed: %.base
+	sed -f transforms2sed.sed $<  | sed s/__SOURCE_FILENAME__/$</g > $@
+
+transform: skydns-rc.yaml.in skydns-svc.yaml.in skydns-rc.yaml.sed skydns-svc.yaml.sed
+
+.PHONY: transform

cluster/saltbase/salt/kube-dns/README.md

+# SkyDNS Replication Controllers and Service templates
+
+This directory contains the base UNDERSCORE templates that can be used
+to generate the skydns-rc.yaml.in and skydns.rc.yaml.in needed in Salt format.
+
+Due to a varied preference in templating language choices, the transform
+Makefile in this directory should be enhanced to generate all required
+formats from the base underscore templates.
+
+## Base Template files
+
+These are the authoritative base templates.
+Run 'make' to generate the Salt and Sed yaml templates from these.
+
+skydns-rc.yaml.base
+skydns-svc.yaml.base
+
+## Generated Salt files
+
+skydns-rc.yaml.in
+skydns-svc.yaml.in
+
+## Generated Sed files
+
+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)]()

cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base

+# Copyright 2016 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
+
+# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
+
+# __MACHINE_GENERATED_WARNING__
+
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: kube-dns-v13
+  namespace: kube-system
+  labels:
+    k8s-app: kube-dns
+    version: v13
+    kubernetes.io/cluster-service: "true"
+spec:
+  replicas: __PILLAR__DNS__REPLICAS__
+  selector:
+    k8s-app: kube-dns
+    version: v13
+  template:
+    metadata:
+      labels:
+        k8s-app: kube-dns
+        version: v13
+        kubernetes.io/cluster-service: "true"
+    spec:
+      containers:
+      - name: kubedns
+        image: gcr.io/google_containers/kubedns-amd64:1.2
+        resources:
+          # TODO: Set memory limits when we've profiled the container for large
+          # clusters, then set request = limit to keep this container in
+          # guaranteed class. Currently, this container falls into the
+          # "burstable" category so the kubelet doesn't backoff from restarting it.
+          limits:
+            cpu: 100m
+            memory: 200Mi
+          requests:
+            cpu: 100m
+            memory: 50Mi
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 60
+          timeoutSeconds: 5
+          successThreshold: 1
+          failureThreshold: 5
+        readinessProbe:
+          httpGet:
+            path: /readiness
+            port: 8081
+            scheme: HTTP
+          # we poll on pod startup for the Kubernetes master service and
+          # only setup the /readiness HTTP server once that's available.
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+        args:
+        # command = "/kube-dns"
+        - --domain=__PILLAR__DNS__DOMAIN__.
+        - --dns-port=10053
+        ports:
+        - containerPort: 10053
+          name: dns-local
+          protocol: UDP
+        - containerPort: 10053
+          name: dns-tcp-local
+          protocol: TCP
+      - name: dnsmasq
+        image: gcr.io/google_containers/dnsmasq:1.1
+        args:
+        - --cache-size=1000
+        - --no-resolv
+        - --server=127.0.0.1#10053
+        ports:
+        - containerPort: 53
+          name: dns
+          protocol: UDP
+        - containerPort: 53
+          name: dns-tcp
+          protocol: TCP
+      - name: healthz
+        image: gcr.io/google_containers/exechealthz-amd64:1.0
+        resources:
+          # keep request = limit to keep this container in guaranteed class
+          limits:
+            cpu: 10m
+            memory: 20Mi
+          requests:
+            cpu: 10m
+            memory: 20Mi
+        args:
+        - -cmd=nslookup kubernetes.default.svc.__PILLAR__DNS__DOMAIN__ 127.0.0.1 >/dev/null
+        - -port=8080
+        ports:
+        - containerPort: 8080
+          protocol: TCP
+      dnsPolicy: Default  # Don't use cluster DNS.

cluster/saltbase/salt/kube-dns/kubedns-rc.yaml.in → cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in

+# Copyright 2016 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
+
+# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
+
+# Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base
+
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-dns-v12
+  name: kube-dns-v13
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v12
+    version: v13
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: {{ pillar['dns_replicas'] }}
   selector:
     k8s-app: kube-dns
-    version: v12
+    version: v13
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v12
+        version: v13
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
       - name: kubedns
-        image: gcr.io/google_containers/kubedns-amd64:1.1
+        image: gcr.io/google_containers/kubedns-amd64:1.2
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -76,7 +96,7 @@ spec:
           name: dns-tcp
           protocol: TCP
       - name: healthz
-        image: gcr.io/google_containers/exechealthz:1.0
+        image: gcr.io/google_containers/exechealthz-amd64:1.0
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:

cluster/addons/dns/skydns-rc.yaml.in → cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed

+# Copyright 2016 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
+
+# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
+
+# Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base
+
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-dns-v11
+  name: kube-dns-v13
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v11
+    version: v13
     kubernetes.io/cluster-service: "true"
 spec:
-  replicas: {{ pillar['dns_replicas'] }}
+  replicas: $DNS_REPLICAS
   selector:
     k8s-app: kube-dns
-    version: v11
+    version: v13
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v11
+        version: v13
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-      - name: etcd
-        image: gcr.io/google_containers/etcd-amd64:2.2.1
+      - name: kubedns
+        image: gcr.io/google_containers/kubedns-amd64:1.2
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -30,33 +49,6 @@ spec:
           # "burstable" category so the kubelet doesn't backoff from restarting it.
           limits:
             cpu: 100m
-            memory: 500Mi
-          requests:
-            cpu: 100m
-            memory: 50Mi
-        command:
-        - /usr/local/bin/etcd
-        - -data-dir
-        - /var/etcd/data
-        - -listen-client-urls
-        - http://127.0.0.1:2379,http://127.0.0.1:4001
-        - -advertise-client-urls
-        - http://127.0.0.1:2379,http://127.0.0.1:4001
-        - -initial-cluster-token
-        - skydns-etcd
-        volumeMounts:
-        - name: etcd-storage
-          mountPath: /var/etcd/data
-      - name: kube2sky
-        image: gcr.io/google_containers/kube2sky-amd64:1.15
-        resources:
-          # TODO: Set memory limits when we've profiled the container for large
-          # clusters, then set request = limit to keep this container in
-          # guaranteed class. Currently, this container falls into the
-          # "burstable" category so the kubelet doesn't backoff from restarting it.
-          limits:
-            cpu: 100m
-            # Kube2sky watches all pods.
             memory: 200Mi
           requests:
             cpu: 100m
@@ -80,27 +72,22 @@ spec:
           initialDelaySeconds: 30
           timeoutSeconds: 5
         args:
-        # command = "/kube2sky"
-        - --domain={{ pillar['dns_domain'] }}
-      - name: skydns
-        image: gcr.io/google_containers/skydns:2015-10-13-8c72f8c
-        resources:
-          # TODO: Set memory limits when we've profiled the container for large
-          # clusters, then set request = limit to keep this container in
-          # guaranteed class. Currently, this container falls into the
-          # "burstable" category so the kubelet doesn't backoff from restarting it.
-          limits:
-            cpu: 100m
-            memory: 200Mi
-          requests:
-            cpu: 100m
-            memory: 50Mi
+        # command = "/kube-dns"
+        - --domain=$DNS_DOMAIN}}.
+        - --dns-port=10053
+        ports:
+        - containerPort: 10053
+          name: dns-local
+          protocol: UDP
+        - containerPort: 10053
+          name: dns-tcp-local
+          protocol: TCP
+      - name: dnsmasq
+        image: gcr.io/google_containers/dnsmasq:1.1
         args:
-        # command = "/skydns"
-        - -machines=http://127.0.0.1:4001
-        - -addr=0.0.0.0:53
-        - -ns-rotate=false
-        - -domain={{ pillar['dns_domain'] }}.
+        - --cache-size=1000
+        - --no-resolv
+        - --server=127.0.0.1#10053
         ports:
         - containerPort: 53
           name: dns
@@ -109,7 +96,7 @@ spec:
           name: dns-tcp
           protocol: TCP
       - name: healthz
-        image: gcr.io/google_containers/exechealthz:1.0
+        image: gcr.io/google_containers/exechealthz-amd64:1.0
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:
@@ -119,12 +106,9 @@ spec:
             cpu: 10m
             memory: 20Mi
         args:
-        - -cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1 >/dev/null
+        - -cmd=nslookup kubernetes.default.svc.$DNS_DOMAIN}} 127.0.0.1 >/dev/null
         - -port=8080
         ports:
         - containerPort: 8080
           protocol: TCP
-      volumes:
-      - name: etcd-storage
-        emptyDir: {}
       dnsPolicy: Default  # Don't use cluster DNS.

cluster/saltbase/salt/kube-dns/kubedns-svc.yaml.in → cluster/saltbase/salt/kube-dns/skydns-svc.yaml.base

+# Copyright 2016 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml
+
+# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
+
+# __MACHINE_GENERATED_WARNING__
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -10,7 +30,7 @@ metadata:
 spec:
   selector:
     k8s-app: kube-dns
-  clusterIP:  {{ pillar['dns_server'] }}
+  clusterIP:  __PILLAR__DNS__SERVER__
   ports:
   - name: dns
     port: 53

cluster/addons/dns/skydns-svc.yaml.in → cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in

+# Copyright 2016 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml
+
+# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
+
+# Warning: This is a file generated from the base underscore template file: skydns-svc.yaml.base
+
 apiVersion: v1
 kind: Service
 metadata:

cluster/saltbase/salt/kube-dns/skydns-svc.yaml.sed

+# Copyright 2016 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml
+
+# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
+
+# Warning: This is a file generated from the base underscore template file: skydns-svc.yaml.base
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: kube-dns
+  namespace: kube-system
+  labels:
+    k8s-app: kube-dns
+    kubernetes.io/cluster-service: "true"
+    kubernetes.io/name: "KubeDNS"
+spec:
+  selector:
+    k8s-app: kube-dns
+  clusterIP:  $DNS_SERVER_IP
+  ports:
+  - name: dns
+    port: 53
+    protocol: UDP
+  - name: dns-tcp
+    port: 53
+    protocol: TCP

cluster/saltbase/salt/kube-dns/transforms2salt.sed

+s/__PILLAR__DNS__SERVER__/{{ pillar['dns_server'] }}/g
+s/__PILLAR__DNS__REPLICAS__/{{ pillar['dns_replicas'] }}/g
+s/__PILLAR__DNS__DOMAIN__/{{ pillar['dns_domain'] }}/g
+s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g
\ No newline at end of file

cluster/saltbase/salt/kube-dns/transforms2sed.sed

+s/__PILLAR__DNS__SERVER__/$DNS_SERVER_IP/g
+s/__PILLAR__DNS__REPLICAS__/$DNS_REPLICAS/g
+s/__PILLAR__DNS__DOMAIN__/$DNS_DOMAIN}}/g
+s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g
\ No newline at end of file

cluster/ubuntu/deployAddons.sh

@@ -41,8 +41,8 @@ function init {
 
 function deploy_dns {
   echo "Deploying DNS on Kubernetes"
-  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
-  sed -e "s/{{ pillar\['dns_server'\] }}/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/addons/dns/skydns-svc.yaml.in" > skydns-svc.yaml
+  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_server'\] }}/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in" > skydns-svc.yaml
 
   KUBEDNS=`eval "${KUBECTL} get services --namespace=kube-system | grep kube-dns | cat"`
       

docs/devel/running-locally.md

@@ -189,7 +189,7 @@ KUBE_DNS_DOMAIN="cluster.local"
 KUBE_DNS_REPLICAS=1
 ```
 
-To know more on DNS service you can look [here](http://issue.k8s.io/6667). Related documents can be found [here](../../cluster/addons/dns/#how-do-i-configure-it)
+To know more on DNS service you can look [here](http://issue.k8s.io/6667). Related documents can be found [here](../../build/kube-dns/#how-do-i-configure-it)
 
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->

examples/cluster-dns/README.md

@@ -38,7 +38,7 @@ This is a toy example demonstrating how to use kubernetes DNS.
 
 ### Step Zero: Prerequisites
 
-This example assumes that you have forked the repository and [turned up a Kubernetes cluster](../../docs/getting-started-guides/). Make sure DNS is enabled in your setup, see [DNS doc](../../cluster/addons/dns/).
+This example assumes that you have forked the repository and [turned up a Kubernetes cluster](../../docs/getting-started-guides/). Make sure DNS is enabled in your setup, see [DNS doc](../../build/kube-dns/).
 
 ```sh
 $ cd kubernetes

examples/mysql-wordpress-pd/README.md

@@ -98,7 +98,7 @@ this example.
 * Kubernetes version 1.2 is required due to using newer features, such
   at PV Claims and Deployments. Run `kubectl version` to see your
   cluster version.
-* [Cluster DNS](../../cluster/addons/dns/) will be used for service discovery.
+* [Cluster DNS](../../build/kube-dns/) will be used for service discovery.
 * An [external load balancer](http://kubernetes.io/docs/user-guide/services/#type-loadbalancer)
   will be used to access WordPress.
 * [Persistent Volume Claims](http://kubernetes.io/docs/user-guide/persistent-volumes/)

hack/local-up-cluster.sh

@@ -408,8 +408,8 @@ 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/addons/dns/skydns-rc.yaml.in" >| skydns-rc.yaml
-        sed -e "s/{{ pillar\['dns_server'\] }}/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/addons/dns/skydns-svc.yaml.in" >| skydns-svc.yaml
+        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_server'\] }}/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in" >| skydns-svc.yaml
         cat <<EOF >namespace.yaml
 apiVersion: v1
 kind: Namespace