From 96b5c332833d95667239d62ea9ca274007f3645d Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Sat, 13 Jan 2018 08:18:37 -0800
Subject: [PATCH 1/3] cluster: remove centos dependency on saltbase

---
 .../{saltbase/salt/generate-cert => centos}/make-ca-cert.sh  | 5 -----
 cluster/centos/util.sh                                       | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)
 rename cluster/{saltbase/salt/generate-cert => centos}/make-ca-cert.sh (92%)

diff --git a/cluster/saltbase/salt/generate-cert/make-ca-cert.sh b/cluster/centos/make-ca-cert.sh
similarity index 92%
rename from cluster/saltbase/salt/generate-cert/make-ca-cert.sh
rename to cluster/centos/make-ca-cert.sh
index 41531209ed5..c86f27bba2b 100755
--- a/cluster/saltbase/salt/generate-cert/make-ca-cert.sh
+++ b/cluster/centos/make-ca-cert.sh
@@ -33,11 +33,6 @@ mkdir -p "$cert_dir"
 
 use_cn=false
 
-# TODO: Add support for discovery on other providers?
-if [ "$cert_ip" == "_use_gce_external_ip_" ]; then
-  cert_ip=$(curl -s -H Metadata-Flavor:Google http://metadata.google.internal./computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip)
-fi
-
 sans="IP:${cert_ip}"
 if [[ -n "${extra_sans}" ]]; then
   sans="${sans},${extra_sans}"
diff --git a/cluster/centos/util.sh b/cluster/centos/util.sh
index 88302a31a93..10378428bca 100755
--- a/cluster/centos/util.sh
+++ b/cluster/centos/util.sh
@@ -234,7 +234,7 @@ echo "[INFO] tear-down-node on $1"
 # Generate the CA certificates for k8s components
 function make-ca-cert() {
   echo "[INFO] make-ca-cert"
-  bash "${ROOT}/../saltbase/salt/generate-cert/make-ca-cert.sh" "${MASTER_ADVERTISE_IP}" "IP:${MASTER_ADVERTISE_IP},IP:${SERVICE_CLUSTER_IP_RANGE%.*}.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"
+  bash "${ROOT}/make-ca-cert.sh" "${MASTER_ADVERTISE_IP}" "IP:${MASTER_ADVERTISE_IP},IP:${SERVICE_CLUSTER_IP_RANGE%.*}.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"
 }
 
 # Provision master

From 13116457ba6ed28f1d72061aa52c99d53fe95040 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Sat, 13 Jan 2018 08:24:17 -0800
Subject: [PATCH 2/3] cluster: remove gce dependencies out of salt

basically just:
* move all manifests into the new gce/manifests dir
* move limit-range into gce/addons/limit-range
* move abac jsonl into gce/manifests. this is gross but we will
  hopefully be able to delete this config soon. it only exists to support
  a deprecated feature.
* fix build, release, deploy to look for everything in its new home
---
 build/lib/release.sh                          | 41 +++++++++----------
 cluster/BUILD                                 | 22 +++-------
 cluster/gce/BUILD                             | 18 ++++++++
 .../addons}/limit-range/limit-range.yaml      |  0
 cluster/gce/gci/configure-helper.sh           |  8 ++--
 .../manifests}/abac-authz-policy.jsonl        |  0
 .../manifests}/cluster-autoscaler.manifest    |  0
 .../manifests}/e2e-image-puller.manifest      |  0
 .../salt/etcd => gce/manifests}/etcd.manifest |  0
 .../l7-gcp => gce/manifests}/glbc.manifest    |  0
 .../manifests}/kube-addon-manager.yaml        |  0
 .../manifests}/kube-apiserver.manifest        |  0
 .../kube-controller-manager.manifest          |  0
 .../manifests}/kube-proxy.manifest            |  0
 .../manifests}/kube-registry-proxy.yaml       |  0
 .../manifests}/kube-scheduler.manifest        |  0
 .../manifests}/rescheduler.manifest           |  0
 cluster/saltbase/BUILD                        | 39 ------------------
 18 files changed, 46 insertions(+), 82 deletions(-)
 rename cluster/{saltbase/salt/kube-admission-controls => gce/addons}/limit-range/limit-range.yaml (100%)
 rename cluster/{saltbase/salt/kube-apiserver => gce/manifests}/abac-authz-policy.jsonl (100%)
 rename cluster/{saltbase/salt/cluster-autoscaler => gce/manifests}/cluster-autoscaler.manifest (100%)
 rename cluster/{saltbase/salt/e2e-image-puller => gce/manifests}/e2e-image-puller.manifest (100%)
 rename cluster/{saltbase/salt/etcd => gce/manifests}/etcd.manifest (100%)
 rename cluster/{saltbase/salt/l7-gcp => gce/manifests}/glbc.manifest (100%)
 rename cluster/{saltbase/salt/kube-addons => gce/manifests}/kube-addon-manager.yaml (100%)
 rename cluster/{saltbase/salt/kube-apiserver => gce/manifests}/kube-apiserver.manifest (100%)
 rename cluster/{saltbase/salt/kube-controller-manager => gce/manifests}/kube-controller-manager.manifest (100%)
 rename cluster/{saltbase/salt/kube-proxy => gce/manifests}/kube-proxy.manifest (100%)
 rename cluster/{saltbase/salt/kube-registry-proxy => gce/manifests}/kube-registry-proxy.yaml (100%)
 rename cluster/{saltbase/salt/kube-scheduler => gce/manifests}/kube-scheduler.manifest (100%)
 rename cluster/{saltbase/salt/rescheduler => gce/manifests}/rescheduler.manifest (100%)

diff --git a/build/lib/release.sh b/build/lib/release.sh
index 9b820b1bbd3..1fd9296fd01 100644
--- a/build/lib/release.sh
+++ b/build/lib/release.sh
@@ -391,38 +391,35 @@ function kube::release::package_salt_tarball() {
 function kube::release::package_kube_manifests_tarball() {
   kube::log::status "Building tarball: manifests"
 
-  local salt_dir="${KUBE_ROOT}/cluster/saltbase/salt"
+  local src_dir="${KUBE_ROOT}/cluster/gce/manifests"
 
   local release_stage="${RELEASE_STAGE}/manifests/kubernetes"
   rm -rf "${release_stage}"
 
-  mkdir -p "${release_stage}"
-  cp "${salt_dir}/kube-registry-proxy/kube-registry-proxy.yaml" "${release_stage}/"
-  cp "${salt_dir}/kube-proxy/kube-proxy.manifest" "${release_stage}/"
-
-  local gci_dst_dir="${release_stage}/gci-trusty"
-  mkdir -p "${gci_dst_dir}"
-  cp "${salt_dir}/cluster-autoscaler/cluster-autoscaler.manifest" "${gci_dst_dir}/"
-  cp "${salt_dir}/etcd/etcd.manifest" "${gci_dst_dir}"
-  cp "${salt_dir}/kube-scheduler/kube-scheduler.manifest" "${gci_dst_dir}"
-  cp "${salt_dir}/kube-apiserver/kube-apiserver.manifest" "${gci_dst_dir}"
-  cp "${salt_dir}/kube-apiserver/abac-authz-policy.jsonl" "${gci_dst_dir}"
-  cp "${salt_dir}/kube-controller-manager/kube-controller-manager.manifest" "${gci_dst_dir}"
-  cp "${salt_dir}/kube-addons/kube-addon-manager.yaml" "${gci_dst_dir}"
-  cp "${salt_dir}/l7-gcp/glbc.manifest" "${gci_dst_dir}"
-  cp "${salt_dir}/rescheduler/rescheduler.manifest" "${gci_dst_dir}/"
-  cp "${salt_dir}/e2e-image-puller/e2e-image-puller.manifest" "${gci_dst_dir}/"
-  cp "${KUBE_ROOT}/cluster/gce/gci/configure-helper.sh" "${gci_dst_dir}/gci-configure-helper.sh"
-  cp "${KUBE_ROOT}/cluster/gce/gci/health-monitor.sh" "${gci_dst_dir}/health-monitor.sh"
-  cp -r "${salt_dir}/kube-admission-controls/limit-range" "${gci_dst_dir}"
+  local dst_dir="${release_stage}/gci-trusty"
+  mkdir -p "${dst_dir}"
+  cp "${src_dir}/kube-registry-proxy.yaml" "${dst_dir}/"
+  cp "${src_dir}/kube-proxy.manifest" "${dst_dir}/"
+  cp "${src_dir}/cluster-autoscaler.manifest" "${dst_dir}/"
+  cp "${src_dir}/etcd.manifest" "${dst_dir}"
+  cp "${src_dir}/kube-scheduler.manifest" "${dst_dir}"
+  cp "${src_dir}/kube-apiserver.manifest" "${dst_dir}"
+  cp "${src_dir}/abac-authz-policy.jsonl" "${dst_dir}"
+  cp "${src_dir}/kube-controller-manager.manifest" "${dst_dir}"
+  cp "${src_dir}/kube-addon-manager.yaml" "${dst_dir}"
+  cp "${src_dir}/glbc.manifest" "${dst_dir}"
+  cp "${src_dir}/rescheduler.manifest" "${dst_dir}/"
+  cp "${src_dir}/e2e-image-puller.manifest" "${dst_dir}/"
+  cp "${KUBE_ROOT}/cluster/gce/gci/configure-helper.sh" "${dst_dir}/gci-configure-helper.sh"
+  cp "${KUBE_ROOT}/cluster/gce/gci/health-monitor.sh" "${dst_dir}/health-monitor.sh"
   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 "${gci_dst_dir}"
+  tar c -C "${KUBE_ROOT}/cluster/addons" ${objects} | tar x -C "${dst_dir}"
   # Merge GCE-specific addons with general purpose addons.
   local gce_objects
   gce_objects=$(cd "${KUBE_ROOT}/cluster/gce/addons" && find . \( -name \*.yaml -or -name \*.yaml.in -or -name \*.json \) \( -not -name \*demo\* \))
   if [[ -n "${gce_objects}" ]]; then
-    tar c -C "${KUBE_ROOT}/cluster/gce/addons" ${gce_objects} | tar x -C "${gci_dst_dir}"
+    tar c -C "${KUBE_ROOT}/cluster/gce/addons" ${gce_objects} | tar x -C "${dst_dir}"
   fi
 
   kube::release::clean_cruft
diff --git a/cluster/BUILD b/cluster/BUILD
index 9d3ad2c9744..8dea73c4cd2 100644
--- a/cluster/BUILD
+++ b/cluster/BUILD
@@ -25,27 +25,15 @@ filegroup(
     tags = ["automanaged"],
 )
 
-# All of the manifests that are expected to be in a "gci-trusty"
-# subdir of the manifests tarball.
-pkg_tar(
-    name = "_manifests-gci-trusty",
-    package_dir = "gci-trusty",
-    visibility = ["//visibility:private"],
-    deps = [
-        "//cluster/addons",
-        "//cluster/gce:gci-trusty-manifests",
-        "//cluster/gce/addons",
-        "//cluster/saltbase:gci-trusty-salt-manifests",
-    ],
-)
-
 pkg_tar(
     name = "manifests",
     mode = "0644",
-    package_dir = "kubernetes",
+    package_dir = "kubernetes/gci-trusty",
     deps = [
-        ":_manifests-gci-trusty",
-        "//cluster/saltbase:salt-manifests",
+        "//cluster/addons",
+        "//cluster/gce:gce-master-manifests",
+        "//cluster/gce:gci-trusty-manifests",
+        "//cluster/gce/addons",
     ],
 )
 
diff --git a/cluster/gce/BUILD b/cluster/gce/BUILD
index e297c36ef6f..9f0717fe71d 100644
--- a/cluster/gce/BUILD
+++ b/cluster/gce/BUILD
@@ -49,3 +49,21 @@ release_filegroup(
         "gci/node.yaml",
     ],
 )
+
+pkg_tar(
+    name = "gce-master-manifests",
+    files = [
+        "manifests/abac-authz-policy.jsonl",
+        "manifests/cluster-autoscaler.manifest",
+        "manifests/e2e-image-puller.manifest",
+        "manifests/etcd.manifest",
+        "manifests/glbc.manifest",
+        "manifests/kube-addon-manager.yaml",
+        "manifests/kube-apiserver.manifest",
+        "manifests/kube-controller-manager.manifest",
+        "manifests/kube-proxy.manifest",
+        "manifests/kube-scheduler.manifest",
+        "manifests/rescheduler.manifest",
+    ],
+    mode = "0644",
+)
diff --git a/cluster/saltbase/salt/kube-admission-controls/limit-range/limit-range.yaml b/cluster/gce/addons/limit-range/limit-range.yaml
similarity index 100%
rename from cluster/saltbase/salt/kube-admission-controls/limit-range/limit-range.yaml
rename to cluster/gce/addons/limit-range/limit-range.yaml
diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index 5d22636a5b5..53aaa48fd52 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1334,7 +1334,7 @@ function prepare-kube-proxy-manifest-variables {
 function start-kube-proxy {
   echo "Start kube-proxy static pod"
   prepare-log-file /var/log/kube-proxy.log
-  local -r src_file="${KUBE_HOME}/kube-manifests/kubernetes/kube-proxy.manifest"
+  local -r src_file="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty/kube-proxy.manifest"
   prepare-kube-proxy-manifest-variables "${src_file}"
 
   cp "${src_file}" /etc/kubernetes/manifests
@@ -2077,7 +2077,7 @@ EOF
   sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${kubedns_file}"
 
   if [[ "${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-}" == "true" ]]; then
-    setup-addon-manifests "addons" "dns-horizontal-autoscaler"
+    setup-addon-manifests "addons" "dns-horizontal-autoscaler" "gce"
   fi
 }
 
@@ -2225,7 +2225,7 @@ EOF
     setup-addon-manifests "addons" "node-problem-detector/standalone" "node-problem-detector"
   fi
   if echo "${ADMISSION_CONTROL:-}" | grep -q "LimitRanger"; then
-    setup-addon-manifests "admission-controls" "limit-range"
+    setup-addon-manifests "admission-controls" "limit-range" "gce"
   fi
   if [[ "${NETWORK_POLICY_PROVIDER:-}" == "calico" ]]; then
     setup-addon-manifests "addons" "calico-policy-controller"
@@ -2260,7 +2260,7 @@ function start-image-puller {
 # Starts kube-registry proxy
 function start-kube-registry-proxy {
   echo "Start kube-registry-proxy"
-  cp "${KUBE_HOME}/kube-manifests/kubernetes/kube-registry-proxy.yaml" /etc/kubernetes/manifests
+  cp "${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty/kube-registry-proxy.yaml" /etc/kubernetes/manifests
 }
 
 # Starts a l7 loadbalancing controller for ingress.
diff --git a/cluster/saltbase/salt/kube-apiserver/abac-authz-policy.jsonl b/cluster/gce/manifests/abac-authz-policy.jsonl
similarity index 100%
rename from cluster/saltbase/salt/kube-apiserver/abac-authz-policy.jsonl
rename to cluster/gce/manifests/abac-authz-policy.jsonl
diff --git a/cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest b/cluster/gce/manifests/cluster-autoscaler.manifest
similarity index 100%
rename from cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest
rename to cluster/gce/manifests/cluster-autoscaler.manifest
diff --git a/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest b/cluster/gce/manifests/e2e-image-puller.manifest
similarity index 100%
rename from cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest
rename to cluster/gce/manifests/e2e-image-puller.manifest
diff --git a/cluster/saltbase/salt/etcd/etcd.manifest b/cluster/gce/manifests/etcd.manifest
similarity index 100%
rename from cluster/saltbase/salt/etcd/etcd.manifest
rename to cluster/gce/manifests/etcd.manifest
diff --git a/cluster/saltbase/salt/l7-gcp/glbc.manifest b/cluster/gce/manifests/glbc.manifest
similarity index 100%
rename from cluster/saltbase/salt/l7-gcp/glbc.manifest
rename to cluster/gce/manifests/glbc.manifest
diff --git a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml b/cluster/gce/manifests/kube-addon-manager.yaml
similarity index 100%
rename from cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
rename to cluster/gce/manifests/kube-addon-manager.yaml
diff --git a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest b/cluster/gce/manifests/kube-apiserver.manifest
similarity index 100%
rename from cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
rename to cluster/gce/manifests/kube-apiserver.manifest
diff --git a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest b/cluster/gce/manifests/kube-controller-manager.manifest
similarity index 100%
rename from cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
rename to cluster/gce/manifests/kube-controller-manager.manifest
diff --git a/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest b/cluster/gce/manifests/kube-proxy.manifest
similarity index 100%
rename from cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
rename to cluster/gce/manifests/kube-proxy.manifest
diff --git a/cluster/saltbase/salt/kube-registry-proxy/kube-registry-proxy.yaml b/cluster/gce/manifests/kube-registry-proxy.yaml
similarity index 100%
rename from cluster/saltbase/salt/kube-registry-proxy/kube-registry-proxy.yaml
rename to cluster/gce/manifests/kube-registry-proxy.yaml
diff --git a/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest b/cluster/gce/manifests/kube-scheduler.manifest
similarity index 100%
rename from cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest
rename to cluster/gce/manifests/kube-scheduler.manifest
diff --git a/cluster/saltbase/salt/rescheduler/rescheduler.manifest b/cluster/gce/manifests/rescheduler.manifest
similarity index 100%
rename from cluster/saltbase/salt/rescheduler/rescheduler.manifest
rename to cluster/gce/manifests/rescheduler.manifest
diff --git a/cluster/saltbase/BUILD b/cluster/saltbase/BUILD
index 13723fb63e3..484ca06ca60 100644
--- a/cluster/saltbase/BUILD
+++ b/cluster/saltbase/BUILD
@@ -45,42 +45,3 @@ pkg_tar(
         ":_salt_kube-addons",
     ],
 )
-
-# The following are used in the kubernetes salt tarball.
-pkg_tar(
-    name = "salt-manifests",
-    files = [
-        "salt/kube-proxy/kube-proxy.manifest",
-        "salt/kube-registry-proxy/kube-registry-proxy.yaml",
-    ],
-    mode = "0644",
-)
-
-pkg_tar(
-    name = "_kube-admission-controls",
-    files = glob(["salt/kube-admission-controls/limit-range/**"]),
-    mode = "0644",
-    # Maintain limit-range/ subdirectory in tarball
-    strip_prefix = "./salt/kube-admission-controls/",
-    visibility = ["//visibility:private"],
-)
-
-pkg_tar(
-    name = "gci-trusty-salt-manifests",
-    files = [
-        "salt/cluster-autoscaler/cluster-autoscaler.manifest",
-        "salt/e2e-image-puller/e2e-image-puller.manifest",
-        "salt/etcd/etcd.manifest",
-        "salt/kube-addons/kube-addon-manager.yaml",
-        "salt/kube-apiserver/abac-authz-policy.jsonl",
-        "salt/kube-apiserver/kube-apiserver.manifest",
-        "salt/kube-controller-manager/kube-controller-manager.manifest",
-        "salt/kube-scheduler/kube-scheduler.manifest",
-        "salt/l7-gcp/glbc.manifest",
-        "salt/rescheduler/rescheduler.manifest",
-    ],
-    mode = "0644",
-    deps = [
-        "_kube-admission-controls",
-    ],
-)

From 5f9735de53c0a7f1334d91b59bcd87c6fbe2a06f Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Sat, 13 Jan 2018 09:14:35 -0800
Subject: [PATCH 3/3] cluster: delete saltbase

and don't build kubernetes-salt.tar.gz
---
 build/README.md                               |   2 -
 build/lib/release.sh                          |  39 +-
 build/release-tars/BUILD                      |  11 -
 cluster/BUILD                                 |   1 -
 .../fluentd-es-configmap.yaml                 |  11 -
 cluster/common.sh                             |  17 -
 cluster/gce/util.sh                           |  11 -
 cluster/saltbase/BUILD                        |  47 --
 cluster/saltbase/README.md                    |  19 -
 cluster/saltbase/install.sh                   | 109 ----
 cluster/saltbase/pillar/README.md             |  22 -
 cluster/saltbase/pillar/cluster-params.sls    |   4 -
 cluster/saltbase/pillar/docker-images.sls     |   5 -
 cluster/saltbase/pillar/logging.sls           |   1 -
 cluster/saltbase/pillar/mine.sls              |  12 -
 cluster/saltbase/pillar/privilege.sls         |   2 -
 cluster/saltbase/pillar/systemd.sls           |   9 -
 cluster/saltbase/pillar/top.sls               |   8 -
 cluster/saltbase/reactor/README.md            |   6 -
 .../saltbase/reactor/highstate-masters.sls    |  10 -
 .../saltbase/reactor/highstate-minions.sls    |  10 -
 cluster/saltbase/reactor/highstate-new.sls    |   4 -
 cluster/saltbase/salt/README.md               |  29 --
 cluster/saltbase/salt/base.sls                |  46 --
 cluster/saltbase/salt/calico/OWNERS           |   6 -
 cluster/saltbase/salt/calico/node.sls         |   9 -
 .../saltbase/salt/cluster-autoscaler/OWNERS   |  12 -
 .../saltbase/salt/cluster-autoscaler/init.sls |  25 -
 cluster/saltbase/salt/cni/OWNERS              |   8 -
 cluster/saltbase/salt/cni/init.sls            |  26 -
 .../salt/debian-auto-upgrades/20auto-upgrades |   4 -
 .../salt/debian-auto-upgrades/init.sls        |  13 -
 cluster/saltbase/salt/docker/default          |   8 -
 cluster/saltbase/salt/docker/docker-defaults  |  18 -
 .../saltbase/salt/docker/docker-healthcheck   |  44 --
 .../salt/docker/docker-healthcheck.service    |   9 -
 .../salt/docker/docker-healthcheck.timer      |   9 -
 cluster/saltbase/salt/docker/docker-prestart  |  22 -
 cluster/saltbase/salt/docker/docker.list      |   1 -
 cluster/saltbase/salt/docker/docker.service   |  21 -
 cluster/saltbase/salt/docker/init.sls         | 493 ------------------
 .../saltbase/salt/e2e-image-puller/init.sls   |  12 -
 cluster/saltbase/salt/e2e/init.sls            |  28 -
 cluster/saltbase/salt/etcd/init.sls           |  83 ---
 cluster/saltbase/salt/generate-cert/init.sls  |  37 --
 .../saltbase/salt/generate-cert/make-cert.sh  |  26 -
 cluster/saltbase/salt/kube-addons/init.sls    | 215 --------
 .../salt/kube-admission-controls/init.sls     |  10 -
 cluster/saltbase/salt/kube-apiserver/init.sls |  71 ---
 cluster/saltbase/salt/kube-client-tools.sls   |   6 -
 .../salt/kube-controller-manager/init.sls     |  30 --
 .../saltbase/salt/kube-master-addons/init.sls |  52 --
 .../saltbase/salt/kube-master-addons/initd    |  95 ----
 .../kube-master-addons.service                |   9 -
 .../kube-master-addons/kube-master-addons.sh  |  90 ----
 .../saltbase/salt/kube-node-unpacker/init.sls |  67 ---
 .../saltbase/salt/kube-node-unpacker/initd    |  95 ----
 .../kube-node-unpacker.service                |   9 -
 .../kube-node-unpacker/kube-node-unpacker.sh  |  46 --
 cluster/saltbase/salt/kube-proxy/OWNERS       |  12 -
 cluster/saltbase/salt/kube-proxy/init.sls     |  40 --
 cluster/saltbase/salt/kube-proxy/kubeconfig   |   0
 .../salt/kube-registry-proxy/init.sls         |   8 -
 cluster/saltbase/salt/kube-scheduler/init.sls |  30 --
 cluster/saltbase/salt/kubelet/default         | 192 -------
 cluster/saltbase/salt/kubelet/init.sls        | 106 ----
 cluster/saltbase/salt/kubelet/initd           | 126 -----
 cluster/saltbase/salt/kubelet/kubeconfig      |   0
 cluster/saltbase/salt/kubelet/kubelet.service |  14 -
 cluster/saltbase/salt/l7-gcp/OWNERS           |   6 -
 cluster/saltbase/salt/l7-gcp/init.sls         |  17 -
 cluster/saltbase/salt/logrotate/conf          |  13 -
 cluster/saltbase/salt/logrotate/cron          |   2 -
 .../saltbase/salt/logrotate/docker-containers |  10 -
 cluster/saltbase/salt/logrotate/init.sls      |  35 --
 cluster/saltbase/salt/ntp/init.sls            |  11 -
 .../opencontrail-networking-master/init.sls   |  15 -
 .../opencontrail-networking-minion/init.sls   |  15 -
 cluster/saltbase/salt/rescheduler/init.sls    |  15 -
 cluster/saltbase/salt/salt-helpers/init.sls   |  24 -
 cluster/saltbase/salt/salt-helpers/pkg-apt    |  70 ---
 cluster/saltbase/salt/salt-helpers/services   |  72 ---
 .../salt/supervisor/docker-checker.sh         |  87 ----
 cluster/saltbase/salt/supervisor/docker.conf  |   6 -
 cluster/saltbase/salt/supervisor/init.sls     | 102 ----
 .../salt/supervisor/kube-addons-checker.sh    |  34 --
 .../saltbase/salt/supervisor/kube-addons.conf |   6 -
 .../salt/supervisor/kubelet-checker.sh        |  37 --
 cluster/saltbase/salt/supervisor/kubelet.conf |   6 -
 .../salt/supervisor/supervisor_watcher.sh     |  34 --
 cluster/saltbase/salt/top.sls                 |  73 ---
 91 files changed, 3 insertions(+), 3359 deletions(-)
 delete mode 100644 cluster/saltbase/BUILD
 delete mode 100644 cluster/saltbase/README.md
 delete mode 100755 cluster/saltbase/install.sh
 delete mode 100644 cluster/saltbase/pillar/README.md
 delete mode 100644 cluster/saltbase/pillar/cluster-params.sls
 delete mode 100644 cluster/saltbase/pillar/docker-images.sls
 delete mode 100644 cluster/saltbase/pillar/logging.sls
 delete mode 100644 cluster/saltbase/pillar/mine.sls
 delete mode 100644 cluster/saltbase/pillar/privilege.sls
 delete mode 100644 cluster/saltbase/pillar/systemd.sls
 delete mode 100644 cluster/saltbase/pillar/top.sls
 delete mode 100644 cluster/saltbase/reactor/README.md
 delete mode 100644 cluster/saltbase/reactor/highstate-masters.sls
 delete mode 100644 cluster/saltbase/reactor/highstate-minions.sls
 delete mode 100644 cluster/saltbase/reactor/highstate-new.sls
 delete mode 100644 cluster/saltbase/salt/README.md
 delete mode 100644 cluster/saltbase/salt/base.sls
 delete mode 100644 cluster/saltbase/salt/calico/OWNERS
 delete mode 100644 cluster/saltbase/salt/calico/node.sls
 delete mode 100644 cluster/saltbase/salt/cluster-autoscaler/OWNERS
 delete mode 100644 cluster/saltbase/salt/cluster-autoscaler/init.sls
 delete mode 100644 cluster/saltbase/salt/cni/OWNERS
 delete mode 100644 cluster/saltbase/salt/cni/init.sls
 delete mode 100644 cluster/saltbase/salt/debian-auto-upgrades/20auto-upgrades
 delete mode 100644 cluster/saltbase/salt/debian-auto-upgrades/init.sls
 delete mode 100644 cluster/saltbase/salt/docker/default
 delete mode 100644 cluster/saltbase/salt/docker/docker-defaults
 delete mode 100755 cluster/saltbase/salt/docker/docker-healthcheck
 delete mode 100644 cluster/saltbase/salt/docker/docker-healthcheck.service
 delete mode 100644 cluster/saltbase/salt/docker/docker-healthcheck.timer
 delete mode 100755 cluster/saltbase/salt/docker/docker-prestart
 delete mode 100644 cluster/saltbase/salt/docker/docker.list
 delete mode 100644 cluster/saltbase/salt/docker/docker.service
 delete mode 100644 cluster/saltbase/salt/docker/init.sls
 delete mode 100644 cluster/saltbase/salt/e2e-image-puller/init.sls
 delete mode 100644 cluster/saltbase/salt/e2e/init.sls
 delete mode 100644 cluster/saltbase/salt/etcd/init.sls
 delete mode 100644 cluster/saltbase/salt/generate-cert/init.sls
 delete mode 100755 cluster/saltbase/salt/generate-cert/make-cert.sh
 delete mode 100644 cluster/saltbase/salt/kube-addons/init.sls
 delete mode 100644 cluster/saltbase/salt/kube-admission-controls/init.sls
 delete mode 100644 cluster/saltbase/salt/kube-apiserver/init.sls
 delete mode 100644 cluster/saltbase/salt/kube-client-tools.sls
 delete mode 100644 cluster/saltbase/salt/kube-controller-manager/init.sls
 delete mode 100644 cluster/saltbase/salt/kube-master-addons/init.sls
 delete mode 100644 cluster/saltbase/salt/kube-master-addons/initd
 delete mode 100644 cluster/saltbase/salt/kube-master-addons/kube-master-addons.service
 delete mode 100755 cluster/saltbase/salt/kube-master-addons/kube-master-addons.sh
 delete mode 100644 cluster/saltbase/salt/kube-node-unpacker/init.sls
 delete mode 100755 cluster/saltbase/salt/kube-node-unpacker/initd
 delete mode 100644 cluster/saltbase/salt/kube-node-unpacker/kube-node-unpacker.service
 delete mode 100755 cluster/saltbase/salt/kube-node-unpacker/kube-node-unpacker.sh
 delete mode 100644 cluster/saltbase/salt/kube-proxy/OWNERS
 delete mode 100644 cluster/saltbase/salt/kube-proxy/init.sls
 delete mode 100644 cluster/saltbase/salt/kube-proxy/kubeconfig
 delete mode 100644 cluster/saltbase/salt/kube-registry-proxy/init.sls
 delete mode 100644 cluster/saltbase/salt/kube-scheduler/init.sls
 delete mode 100644 cluster/saltbase/salt/kubelet/default
 delete mode 100644 cluster/saltbase/salt/kubelet/init.sls
 delete mode 100644 cluster/saltbase/salt/kubelet/initd
 delete mode 100644 cluster/saltbase/salt/kubelet/kubeconfig
 delete mode 100644 cluster/saltbase/salt/kubelet/kubelet.service
 delete mode 100644 cluster/saltbase/salt/l7-gcp/OWNERS
 delete mode 100644 cluster/saltbase/salt/l7-gcp/init.sls
 delete mode 100644 cluster/saltbase/salt/logrotate/conf
 delete mode 100755 cluster/saltbase/salt/logrotate/cron
 delete mode 100644 cluster/saltbase/salt/logrotate/docker-containers
 delete mode 100644 cluster/saltbase/salt/logrotate/init.sls
 delete mode 100644 cluster/saltbase/salt/ntp/init.sls
 delete mode 100644 cluster/saltbase/salt/opencontrail-networking-master/init.sls
 delete mode 100644 cluster/saltbase/salt/opencontrail-networking-minion/init.sls
 delete mode 100644 cluster/saltbase/salt/rescheduler/init.sls
 delete mode 100644 cluster/saltbase/salt/salt-helpers/init.sls
 delete mode 100644 cluster/saltbase/salt/salt-helpers/pkg-apt
 delete mode 100644 cluster/saltbase/salt/salt-helpers/services
 delete mode 100755 cluster/saltbase/salt/supervisor/docker-checker.sh
 delete mode 100644 cluster/saltbase/salt/supervisor/docker.conf
 delete mode 100644 cluster/saltbase/salt/supervisor/init.sls
 delete mode 100644 cluster/saltbase/salt/supervisor/kube-addons-checker.sh
 delete mode 100644 cluster/saltbase/salt/supervisor/kube-addons.conf
 delete mode 100755 cluster/saltbase/salt/supervisor/kubelet-checker.sh
 delete mode 100644 cluster/saltbase/salt/supervisor/kubelet.conf
 delete mode 100644 cluster/saltbase/salt/supervisor/supervisor_watcher.sh
 delete mode 100644 cluster/saltbase/salt/top.sls

diff --git a/build/README.md b/build/README.md
index 60f37fb7019..cd453e3cc42 100644
--- a/build/README.md
+++ b/build/README.md
@@ -100,12 +100,10 @@ The main output is a tar file: `kubernetes.tar.gz`.  This includes:
 * Examples
 * Cluster deployment scripts for various clouds
 * Tar file containing all server binaries
-* Tar file containing salt deployment tree shared across multiple cloud deployments.
 
 In addition, there are some other tar files that are created:
 * `kubernetes-client-*.tar.gz` Client binaries for a specific platform.
 * `kubernetes-server-*.tar.gz` Server binaries for a specific platform.
-* `kubernetes-salt.tar.gz` The salt script/tree shared across multiple deployment scripts.
 
 When building final release tars, they are first staged into `_output/release-stage` before being tar'd up and put into `_output/release-tars`.
 
diff --git a/build/lib/release.sh b/build/lib/release.sh
index 1fd9296fd01..f02444d537c 100644
--- a/build/lib/release.sh
+++ b/build/lib/release.sh
@@ -78,7 +78,6 @@ function kube::release::package_tarballs() {
   mkdir -p "${RELEASE_TARS}"
   kube::release::package_src_tarball &
   kube::release::package_client_tarballs &
-  kube::release::package_salt_tarball &
   kube::release::package_kube_manifests_tarball &
   kube::util::wait-for-jobs || { kube::log::error "previous tarball phase failed"; return 1; }
 
@@ -359,35 +358,7 @@ function kube::release::create_docker_images_for_server() {
 
 }
 
-# Package up the salt configuration tree.  This is an optional helper to getting
-# a cluster up and running.
-function kube::release::package_salt_tarball() {
-  kube::log::status "Building tarball: salt"
-
-  local release_stage="${RELEASE_STAGE}/salt/kubernetes"
-  rm -rf "${release_stage}"
-  mkdir -p "${release_stage}"
-
-  cp -R "${KUBE_ROOT}/cluster/saltbase" "${release_stage}/"
-
-  # TODO(#3579): This is a temporary hack. It gathers up the yaml,
-  # yaml.in, json files in cluster/addons (minus any demos) and overlays
-  # them into kube-addons, where we expect them. (This pipeline is a
-  # fancy copy, stripping anything but the files we don't want.)
-  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 "${release_stage}/saltbase/salt/kube-addons"
-
-  kube::release::clean_cruft
-
-  local package_name="${RELEASE_TARS}/kubernetes-salt.tar.gz"
-  kube::release::create_tarball "${package_name}" "${release_stage}/.."
-}
-
-# This will pack kube-system manifests files for distros without using salt
-# such as GCI and Ubuntu Trusty. We directly copy manifests from
-# cluster/addons and cluster/saltbase/salt. The script of cluster initialization
-# will remove the salt configuration and evaluate the variables in the manifests.
+# This will pack kube-system manifests files for distros such as COS.
 function kube::release::package_kube_manifests_tarball() {
   kube::log::status "Building tarball: manifests"
 
@@ -468,8 +439,7 @@ function kube::release::package_test_tarball() {
 # using the bundled cluster/get-kube-binaries.sh script).
 # Included in this tarball:
 #   - Cluster spin up/down scripts and configs for various cloud providers
-#   - Tarballs for salt configs that are ready to be uploaded
-#     to master by whatever means appropriate.
+#   - Tarballs for manifest configs that are ready to be uploaded
 #   - Examples (which may or may not still work)
 #   - The remnants of the docs/ directory
 function kube::release::package_final_tarball() {
@@ -488,13 +458,10 @@ Client binaries are no longer included in the Kubernetes final tarball.
 Run cluster/get-kube-binaries.sh to download client and server binaries.
 EOF
 
-  # We want everything in /cluster except saltbase.  That is only needed on the
-  # server.
+  # We want everything in /cluster.
   cp -R "${KUBE_ROOT}/cluster" "${release_stage}/"
-  rm -rf "${release_stage}/cluster/saltbase"
 
   mkdir -p "${release_stage}/server"
-  cp "${RELEASE_TARS}/kubernetes-salt.tar.gz" "${release_stage}/server/"
   cp "${RELEASE_TARS}/kubernetes-manifests.tar.gz" "${release_stage}/server/"
   cat <<EOF > "${release_stage}/server/README"
 Server binary tarballs are no longer included in the Kubernetes final tarball.
diff --git a/build/release-tars/BUILD b/build/release-tars/BUILD
index 27773468028..9b5beefdc54 100644
--- a/build/release-tars/BUILD
+++ b/build/release-tars/BUILD
@@ -180,7 +180,6 @@ pkg_tar(
     build_tar = "@io_kubernetes_build//tools/build_tar",
     files = [
         ":kubernetes-manifests.tar.gz",
-        ":kubernetes-salt.tar.gz",
     ],
     package_dir = "server",
     visibility = ["//visibility:private"],
@@ -216,15 +215,6 @@ pkg_tar(
     ],
 )
 
-pkg_tar(
-    name = "kubernetes-salt",
-    build_tar = "@io_kubernetes_build//tools/build_tar",
-    extension = "tar.gz",
-    deps = [
-        "//cluster/saltbase:salt",
-    ],
-)
-
 release_filegroup(
     name = "release-tars",
     srcs = [
@@ -233,7 +223,6 @@ release_filegroup(
         ":kubernetes-node-%s.tar.gz" % PLATFORM_ARCH_STRING,
         ":kubernetes-server-%s.tar.gz" % PLATFORM_ARCH_STRING,
         ":kubernetes-manifests.tar.gz",
-        ":kubernetes-salt.tar.gz",
         ":kubernetes-src.tar.gz",
         ":kubernetes-test.tar.gz",
     ],
diff --git a/cluster/BUILD b/cluster/BUILD
index 8dea73c4cd2..ed62e839b49 100644
--- a/cluster/BUILD
+++ b/cluster/BUILD
@@ -20,7 +20,6 @@ filegroup(
         "//cluster/images/etcd/rollback:all-srcs",
         "//cluster/images/hyperkube:all-srcs",
         "//cluster/images/kubemark:all-srcs",
-        "//cluster/saltbase:all-srcs",
     ],
     tags = ["automanaged"],
 )
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml
index 28ffb1c03b1..fc2079c5864 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml
@@ -129,17 +129,6 @@ data:
       max_lines 1000
     </match>
   system.input.conf: |-
-    # Example:
-    # 2015-12-21 23:17:22,066 [salt.state       ][INFO    ] Completed state [net.ipv4.ip_forward] at time 23:17:22.066081
-    <source>
-      type tail
-      format /^(?<time>[^ ]* [^ ,]*)[^\[]*\[[^\]]*\]\[(?<severity>[^ \]]*) *\] (?<message>.*)$/
-      time_format %Y-%m-%d %H:%M:%S
-      path /var/log/salt/minion
-      pos_file /var/log/es-salt.pos
-      tag salt
-    </source>
-
     # Example:
     # Dec 21 23:17:22 gke-foo-1-1-4b5cbd14-node-4eoj startupscript: Finished running startup script /var/run/google.startup.script
     <source>
diff --git a/cluster/common.sh b/cluster/common.sh
index cdc2300612c..a7974030404 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -351,8 +351,6 @@ function set_binary_version() {
 #   KUBE_TAR_HASH
 #   SERVER_BINARY_TAR_URL
 #   SERVER_BINARY_TAR_HASH
-#   SALT_TAR_URL
-#   SALT_TAR_HASH
 function tars_from_version() {
   local sha1sum=""
   if which sha1sum >/dev/null 2>&1; then
@@ -366,13 +364,11 @@ function tars_from_version() {
     upload-server-tars
   elif [[ ${KUBE_VERSION} =~ ${KUBE_RELEASE_VERSION_REGEX} ]]; then
     SERVER_BINARY_TAR_URL="https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz"
-    SALT_TAR_URL="https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/kubernetes-salt.tar.gz"
     # TODO: Clean this up.
     KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}"
     KUBE_MANIFESTS_TAR_HASH=$(curl ${KUBE_MANIFESTS_TAR_URL} --silent --show-error | ${sha1sum} | awk '{print $1}')
   elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then
     SERVER_BINARY_TAR_URL="https://storage.googleapis.com/kubernetes-release-dev/ci/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz"
-    SALT_TAR_URL="https://storage.googleapis.com/kubernetes-release-dev/ci/${KUBE_VERSION}/kubernetes-salt.tar.gz"
     # TODO: Clean this up.
     KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}"
     KUBE_MANIFESTS_TAR_HASH=$(curl ${KUBE_MANIFESTS_TAR_URL} --silent --show-error | ${sha1sum} | awk '{print $1}')
@@ -383,18 +379,11 @@ function tars_from_version() {
   if ! SERVER_BINARY_TAR_HASH=$(curl -Ss --fail "${SERVER_BINARY_TAR_URL}.sha1"); then
     echo "Failure trying to curl release .sha1"
   fi
-  if ! SALT_TAR_HASH=$(curl -Ss --fail "${SALT_TAR_URL}.sha1"); then
-    echo "Failure trying to curl Salt tar .sha1"
-  fi
 
   if ! curl -Ss --head "${SERVER_BINARY_TAR_URL}" >&/dev/null; then
     echo "Can't find release at ${SERVER_BINARY_TAR_URL}" >&2
     exit 1
   fi
-  if ! curl -Ss --head "${SALT_TAR_URL}" >&/dev/null; then
-    echo "Can't find Salt tar at ${SALT_TAR_URL}" >&2
-    exit 1
-  fi
 }
 
 # Search for the specified tarball in the various known output locations,
@@ -427,11 +416,9 @@ function find-tar() {
 #   KUBE_ROOT
 # Vars set:
 #   SERVER_BINARY_TAR
-#   SALT_TAR
 #   KUBE_MANIFESTS_TAR
 function find-release-tars() {
   SERVER_BINARY_TAR=$(find-tar kubernetes-server-linux-amd64.tar.gz)
-  SALT_TAR=$(find-tar kubernetes-salt.tar.gz)
 
   # This tarball is used by GCI, Ubuntu Trusty, and Container Linux.
   KUBE_MANIFESTS_TAR=
@@ -573,13 +560,11 @@ function build-kube-env {
   local file=$2
 
   local server_binary_tar_url=$SERVER_BINARY_TAR_URL
-  local salt_tar_url=$SALT_TAR_URL
   local kube_manifests_tar_url="${KUBE_MANIFESTS_TAR_URL:-}"
   if [[ "${master}" == "true" && "${MASTER_OS_DISTRIBUTION}" == "ubuntu" ]] || \
      [[ "${master}" == "false" && "${NODE_OS_DISTRIBUTION}" == "ubuntu" ]] ; then
     # TODO: Support fallback .tar.gz settings on Container Linux
     server_binary_tar_url=$(split_csv "${SERVER_BINARY_TAR_URL}")
-    salt_tar_url=$(split_csv "${SALT_TAR_URL}")
     kube_manifests_tar_url=$(split_csv "${KUBE_MANIFESTS_TAR_URL}")
   fi
 
@@ -600,8 +585,6 @@ SERVER_BINARY_TAR_URL: $(yaml-quote ${server_binary_tar_url})
 SERVER_BINARY_TAR_HASH: $(yaml-quote ${SERVER_BINARY_TAR_HASH})
 PROJECT_ID: $(yaml-quote ${PROJECT})
 NETWORK_PROJECT_ID: $(yaml-quote ${NETWORK_PROJECT})
-SALT_TAR_URL: $(yaml-quote ${salt_tar_url})
-SALT_TAR_HASH: $(yaml-quote ${SALT_TAR_HASH})
 SERVICE_CLUSTER_IP_RANGE: $(yaml-quote ${SERVICE_CLUSTER_IP_RANGE})
 KUBERNETES_MASTER_NAME: $(yaml-quote ${KUBERNETES_MASTER_NAME})
 ALLOCATE_NODE_CIDRS: $(yaml-quote ${ALLOCATE_NODE_CIDRS:-false})
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index fa9fe834b43..812babe1234 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -255,21 +255,16 @@ fi
 # Assumed vars:
 #   PROJECT
 #   SERVER_BINARY_TAR
-#   SALT_TAR
 #   KUBE_MANIFESTS_TAR
 #   ZONE
 # Vars set:
 #   SERVER_BINARY_TAR_URL
 #   SERVER_BINARY_TAR_HASH
-#   SALT_TAR_URL
-#   SALT_TAR_HASH
 #   KUBE_MANIFESTS_TAR_URL
 #   KUBE_MANIFESTS_TAR_HASH
 function upload-server-tars() {
   SERVER_BINARY_TAR_URL=
   SERVER_BINARY_TAR_HASH=
-  SALT_TAR_URL=
-  SALT_TAR_HASH=
   KUBE_MANIFESTS_TAR_URL=
   KUBE_MANIFESTS_TAR_HASH=
 
@@ -287,13 +282,11 @@ function upload-server-tars() {
   set-preferred-region
 
   SERVER_BINARY_TAR_HASH=$(sha1sum-file "${SERVER_BINARY_TAR}")
-  SALT_TAR_HASH=$(sha1sum-file "${SALT_TAR}")
   if [[ -n "${KUBE_MANIFESTS_TAR:-}" ]]; then
     KUBE_MANIFESTS_TAR_HASH=$(sha1sum-file "${KUBE_MANIFESTS_TAR}")
   fi
 
   local server_binary_tar_urls=()
-  local salt_tar_urls=()
   local kube_manifest_tar_urls=()
 
   for region in "${PREFERRED_REGION[@]}"; do
@@ -313,13 +306,10 @@ function upload-server-tars() {
 
     echo "+++ Staging server tars to Google Storage: ${staging_path}"
     local server_binary_gs_url="${staging_path}/${SERVER_BINARY_TAR##*/}"
-    local salt_gs_url="${staging_path}/${SALT_TAR##*/}"
     copy-to-staging "${staging_path}" "${server_binary_gs_url}" "${SERVER_BINARY_TAR}" "${SERVER_BINARY_TAR_HASH}"
-    copy-to-staging "${staging_path}" "${salt_gs_url}" "${SALT_TAR}" "${SALT_TAR_HASH}"
 
     # Convert from gs:// URL to an https:// URL
     server_binary_tar_urls+=("${server_binary_gs_url/gs:\/\//https://storage.googleapis.com/}")
-    salt_tar_urls+=("${salt_gs_url/gs:\/\//https://storage.googleapis.com/}")
     if [[ -n "${KUBE_MANIFESTS_TAR:-}" ]]; then
       local kube_manifests_gs_url="${staging_path}/${KUBE_MANIFESTS_TAR##*/}"
       copy-to-staging "${staging_path}" "${kube_manifests_gs_url}" "${KUBE_MANIFESTS_TAR}" "${KUBE_MANIFESTS_TAR_HASH}"
@@ -329,7 +319,6 @@ function upload-server-tars() {
   done
 
   SERVER_BINARY_TAR_URL=$(join_csv "${server_binary_tar_urls[@]}")
-  SALT_TAR_URL=$(join_csv "${salt_tar_urls[@]}")
   if [[ -n "${KUBE_MANIFESTS_TAR:-}" ]]; then
     KUBE_MANIFESTS_TAR_URL=$(join_csv "${kube_manifests_tar_urls[@]}")
   fi
diff --git a/cluster/saltbase/BUILD b/cluster/saltbase/BUILD
deleted file mode 100644
index 484ca06ca60..00000000000
--- a/cluster/saltbase/BUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
-
-# TODO(#3579): This is a temporary hack. It gathers up the yaml,
-# yaml.in, json files in cluster/addons (minus any demos) and overlays
-# them into kube-addons, where we expect them.
-# These files are expected in a salt/kube-addons subdirectory.
-pkg_tar(
-    name = "_salt_kube-addons",
-    package_dir = "salt/kube-addons",
-    strip_prefix = "/cluster/addons",
-    visibility = ["//visibility:private"],
-    deps = [
-        "//cluster/addons",
-    ],
-)
-
-pkg_tar(
-    name = "salt",
-    files = glob(
-        ["**"],
-        exclude = ["BUILD"],
-    ),
-    mode = "0644",
-    modes = {
-        "install.sh": "0755",
-    },
-    package_dir = "kubernetes/saltbase",
-    strip_prefix = ".",
-    deps = [
-        ":_salt_kube-addons",
-    ],
-)
diff --git a/cluster/saltbase/README.md b/cluster/saltbase/README.md
deleted file mode 100644
index d3d53792838..00000000000
--- a/cluster/saltbase/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# SaltStack configuration
-
-This is the root of the SaltStack configuration for Kubernetes. A high
-level overview for the Kubernetes SaltStack configuration can be found [in the docs tree.](https://kubernetes.io/docs/admin/salt/)
-
-This SaltStack configuration currently applies to default
-configurations for Debian-on-GCE. (That doesn't mean it can't
-be made to apply to an arbitrary configuration, but those are
-only the in-tree OS/IaaS combinations supported today.) As you
-peruse the configuration, this is shorthanded as `gce`,  in `grains.cloud`;
-the documentation in this tree uses this same shorthand for convenience.
-
-See more:
-* [pillar](pillar/)
-* [reactor](reactor/)
-* [salt](salt/)
-
-
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/saltbase/README.md?pixel)]()
diff --git a/cluster/saltbase/install.sh b/cluster/saltbase/install.sh
deleted file mode 100755
index fdf6c634d15..00000000000
--- a/cluster/saltbase/install.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014 The Kubernetes Authors.
-#
-# 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 script will set up the salt directory on the target server.  It takes one
-# argument that is a tarball with the pre-compiled kubernetes server binaries.
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-SALT_ROOT=$(dirname "${BASH_SOURCE}")
-readonly SALT_ROOT
-
-readonly KUBE_DOCKER_WRAPPED_BINARIES=(
-  kube-apiserver
-  kube-controller-manager
-  kube-scheduler
-  kube-proxy
-)
-
-readonly SERVER_BIN_TAR=${1-}
-if [[ -z "$SERVER_BIN_TAR" ]]; then
-  echo "!!! No binaries specified"
-  exit 1
-fi
-
-# Create a temp dir for untaring
-KUBE_TEMP=$(mktemp --tmpdir=/srv -d -t kubernetes.XXXXXX)
-trap 'rm -rf "${KUBE_TEMP}"' EXIT
-
-# This file is meant to run on the master.  It will install the salt configs
-# into the appropriate place on the master.  We do this by creating a new set of
-# salt trees and then quickly mv'ing them where the old ones were.
-
-readonly SALTDIRS=(salt pillar reactor)
-
-echo "+++ Installing salt files into new trees"
-rm -rf /srv/salt-new
-mkdir -p /srv/salt-new
-
-# This bash voodoo will prepend $SALT_ROOT to the start of each item in the
-# $SALTDIRS array
-cp -v -R --preserve=mode "${SALTDIRS[@]/#/${SALT_ROOT}/}" /srv/salt-new
-
-echo "+++ Installing salt overlay files"
-for dir in "${SALTDIRS[@]}"; do
-  if [[ -d "/srv/salt-overlay/$dir" ]]; then
-    cp -v -R --preserve=mode "/srv/salt-overlay/$dir" "/srv/salt-new/"
-  fi
-done
-
-echo "+++ Install binaries from tar: $1"
-tar -xz -C "${KUBE_TEMP}" -f "$1"
-mkdir -p /srv/salt-new/salt/kube-bins
-mkdir -p /srv/salt-new/salt/kube-docs
-cp -v "${KUBE_TEMP}/kubernetes/server/bin/"* /srv/salt-new/salt/kube-bins/
-cp -v "${KUBE_TEMP}/kubernetes/LICENSES" /srv/salt-new/salt/kube-docs/
-cp -v "${KUBE_TEMP}/kubernetes/kubernetes-src.tar.gz" /srv/salt-new/salt/kube-docs/
-
-kube_bin_dir="/srv/salt-new/salt/kube-bins";
-docker_images_sls_file="/srv/salt-new/pillar/docker-images.sls";
-for docker_file in "${KUBE_DOCKER_WRAPPED_BINARIES[@]}"; do
-  docker_tag=$(cat ${kube_bin_dir}/${docker_file}.docker_tag);
-  if [[ ! -z "${KUBE_IMAGE_TAG:-}" ]]; then
-    docker_tag="${KUBE_IMAGE_TAG}"
-  fi
-  sed -i "s/#${docker_file}_docker_tag_value#/${docker_tag}/" "${docker_images_sls_file}";
-done
-
-cat <<EOF >>"${docker_images_sls_file}"
-kube_docker_registry: '$(echo ${KUBE_DOCKER_REGISTRY:-gcr.io/google_containers})'
-EOF
-
-# TODO(zmerlynn): Forgive me, this is really gross. But in order to
-# avoid breaking the non-Salt deployments, which already painfully
-# have to templatize a couple of the add-ons anyways, manually
-# templatize the addon registry for regional support. When we get
-# better templating, we can fix this.
-readonly kube_addon_registry="${KUBE_ADDON_REGISTRY:-gcr.io/google_containers}"
-if [[ "${kube_addon_registry}" != "gcr.io/google_containers" ]]; then
-  find /srv/salt-new -name \*.yaml -or -name \*.yaml.in | \
-    xargs sed -ri "s@(image:\s.*)gcr.io/google_containers@\1${kube_addon_registry}@"
-  # All the legacy .manifest files with hardcoded gcr.io are JSON.
-  find /srv/salt-new -name \*.manifest -or -name \*.json | \
-    xargs sed -ri "s@(image\":\s+\")gcr.io/google_containers@\1${kube_addon_registry}@"
-fi
-
-echo "+++ Swapping in new configs"
-for dir in "${SALTDIRS[@]}"; do
-  if [[ -d "/srv/$dir" ]]; then
-    rm -rf "/srv/$dir"
-  fi
-  mv -v "/srv/salt-new/$dir" "/srv/$dir"
-done
-
-rm -rf /srv/salt-new
diff --git a/cluster/saltbase/pillar/README.md b/cluster/saltbase/pillar/README.md
deleted file mode 100644
index 3b09c89a8b7..00000000000
--- a/cluster/saltbase/pillar/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-The
-[SaltStack pillar](http://docs.saltstack.com/en/latest/topics/pillar/)
-data is partially statically derived from the contents of this
-directory. The bulk of the pillars are hard to perceive from browsing
-this directory, though, because they are written into
-[cluster-params.sls](cluster-params.sls) at cluster inception.
-
-* [cluster-params.sls](cluster-params.sls) is generated entirely at cluster inception. See e.g. [configure-vm.sh](../../gce/configure-vm.sh#L262)
-* [docker-images.sls](docker-images.sls) stores the Docker tags of the current Docker-wrapped server binaries, twiddling by the Salt install script
-* [logging.sls](logging.sls) defines the cluster log level
-* [mine.sls](mine.sls): defines the variables shared across machines in the Salt
-  mine. It is starting to be largely deprecated in use, and is totally
-  unavailable on GCE, which runs standalone.
-* [privilege.sls](privilege.sls) defines whether privileged containers are allowed.
-* [top.sls](top.sls) defines which pillars are active across the cluster.
-
-## Future work
-
-Document the current pillars across providers
-
-
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/saltbase/pillar/README.md?pixel)]()
diff --git a/cluster/saltbase/pillar/cluster-params.sls b/cluster/saltbase/pillar/cluster-params.sls
deleted file mode 100644
index 3f743b4749f..00000000000
--- a/cluster/saltbase/pillar/cluster-params.sls
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is meant to be replaced with cluster specific parameters if necessary.
-
-# Examples:
-# node_instance_prefix: <base of regex for -minion_regexp to apiserver>
diff --git a/cluster/saltbase/pillar/docker-images.sls b/cluster/saltbase/pillar/docker-images.sls
deleted file mode 100644
index 64256914cc9..00000000000
--- a/cluster/saltbase/pillar/docker-images.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is populated when kubernetes is built.
-kube-apiserver_docker_tag: #kube-apiserver_docker_tag_value#
-kube-controller-manager_docker_tag: #kube-controller-manager_docker_tag_value#
-kube-scheduler_docker_tag: #kube-scheduler_docker_tag_value#
-kube-proxy_docker_tag: #kube-proxy_docker_tag_value#
diff --git a/cluster/saltbase/pillar/logging.sls b/cluster/saltbase/pillar/logging.sls
deleted file mode 100644
index 25e835177f3..00000000000
--- a/cluster/saltbase/pillar/logging.sls
+++ /dev/null
@@ -1 +0,0 @@
-log_level: "--v=2"
diff --git a/cluster/saltbase/pillar/mine.sls b/cluster/saltbase/pillar/mine.sls
deleted file mode 100644
index 45035e47957..00000000000
--- a/cluster/saltbase/pillar/mine.sls
+++ /dev/null
@@ -1,12 +0,0 @@
-{% if grains.cloud is defined and grains.cloud == 'gce' -%}
-# On GCE, there is no Salt mine. We run standalone.
-{% else %}
-# Allow everyone to see cached values of who sits at what IP
-{% set networkInterfaceName = "eth0" %}
-{% if grains.networkInterfaceName is defined %}
-  {% set networkInterfaceName = grains.networkInterfaceName %}
-{% endif %}
-mine_functions:
-  network.ip_addrs: [{{networkInterfaceName}}]
-  grains.items: []
-{% endif -%}
diff --git a/cluster/saltbase/pillar/privilege.sls b/cluster/saltbase/pillar/privilege.sls
deleted file mode 100644
index caa1549a26f..00000000000
--- a/cluster/saltbase/pillar/privilege.sls
+++ /dev/null
@@ -1,2 +0,0 @@
-# If true, allow privileged containers to be created by API
-allow_privileged: true
diff --git a/cluster/saltbase/pillar/systemd.sls b/cluster/saltbase/pillar/systemd.sls
deleted file mode 100644
index e898ef248f1..00000000000
--- a/cluster/saltbase/pillar/systemd.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-{% if grains['oscodename'] in [ 'vivid', 'wily', 'jessie', 'xenial', 'yakkety' ] %}
-is_systemd: True
-systemd_system_path: /lib/systemd/system
-{% elif grains['os_family'] == 'RedHat' %}
-is_systemd: True
-systemd_system_path: /usr/lib/systemd/system
-{% else %}
-is_systemd: False
-{% endif %}
diff --git a/cluster/saltbase/pillar/top.sls b/cluster/saltbase/pillar/top.sls
deleted file mode 100644
index d9ad7dbfc34..00000000000
--- a/cluster/saltbase/pillar/top.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-base:
-  '*':
-    - mine
-    - cluster-params
-    - logging
-    - docker-images
-    - privilege
-    - systemd
diff --git a/cluster/saltbase/reactor/README.md b/cluster/saltbase/reactor/README.md
deleted file mode 100644
index 2b20c47ee93..00000000000
--- a/cluster/saltbase/reactor/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-[SaltStack reactor](http://docs.saltstack.com/en/latest/topics/reactor/) files, largely defining reactions to new nodes.
-
-**Ignored for GCE, which runs standalone on each machine**
-
-
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/saltbase/reactor/README.md?pixel)]()
diff --git a/cluster/saltbase/reactor/highstate-masters.sls b/cluster/saltbase/reactor/highstate-masters.sls
deleted file mode 100644
index 246f7ebce9f..00000000000
--- a/cluster/saltbase/reactor/highstate-masters.sls
+++ /dev/null
@@ -1,10 +0,0 @@
-# This runs highstate on the master node(s).
-#
-# Some of the cluster deployment scripts pass the list of minion addresses to
-# the apiserver as a command line argument. This list needs to be updated if a
-# new minion is started, so run highstate on the master(s) when this happens.
-#
-highstate_master:
-  cmd.state.highstate:
-    - tgt: 'roles:kubernetes-master'
-    - expr_form: grain
diff --git a/cluster/saltbase/reactor/highstate-minions.sls b/cluster/saltbase/reactor/highstate-minions.sls
deleted file mode 100644
index 83d31d8d0cb..00000000000
--- a/cluster/saltbase/reactor/highstate-minions.sls
+++ /dev/null
@@ -1,10 +0,0 @@
-# This runs highstate on the minion nodes.
-#
-# Some of the cluster deployment scripts use the list of minions on the minions
-# themselves. To propagate changes throughout
-# the pool, run highstate on all minions whenever a single minion starts.
-#
-highstate_minions:
-  cmd.state.highstate:
-    - tgt: 'roles:kubernetes-pool'
-    - expr_form: grain
diff --git a/cluster/saltbase/reactor/highstate-new.sls b/cluster/saltbase/reactor/highstate-new.sls
deleted file mode 100644
index 825749dc275..00000000000
--- a/cluster/saltbase/reactor/highstate-new.sls
+++ /dev/null
@@ -1,4 +0,0 @@
-# This runs highstate only on the NEW node, regardless of type.
-highstate_new:
-  cmd.state.highstate:
-    - tgt: {{ data['id'] }}
diff --git a/cluster/saltbase/salt/README.md b/cluster/saltbase/salt/README.md
deleted file mode 100644
index f4c24c202fb..00000000000
--- a/cluster/saltbase/salt/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-This directory forms the base of the main SaltStack configuration. The
-place to start with any SaltStack configuration is
-[top.sls](top.sls). However, unless you are particularly keen on
-reading Jinja templates, the following tables break down what
-configurations run on what providers. (NB: The [_states](_states/)
-directory is a special directory included by Salt for `ensure` blocks,
-and is only used for the [docker](docker/) config.)
-
-Key: M = Config applies to master, n = config applies to nodes
-
-Config                                              | GCE   | Vagrant | AWS | Azure
-----------------------------------------------------|-------|---------|-----|------
-[debian-auto-upgrades](debian-auto-upgrades/)       | M n   | M n     | M n | M n
-[docker](docker/)                                   | M n   | M n     | M n | M n
-[etcd](etcd/)                                       | M     | M       | M   | M
-[generate-cert](generate-cert/)                     | M     | M       | M   | M
-[kube-addons](kube-addons/)                         | M     | M       | M   | M
-[kube-apiserver](kube-apiserver/)                   | M     | M       | M   | M
-[kube-controller-manager](kube-controller-manager/) | M     | M       | M   | M
-[kube-proxy](kube-proxy/)                           |   n   |   n     |   n |   n
-[kube-scheduler](kube-scheduler/)                   | M     | M       | M   | M
-[kubelet](kubelet/)                                 | M n   | M n     | M n | M n
-[logrotate](logrotate/)                             | M n   |   n     | M n | M n
-[supervisord](supervisor/)                          | M n   | M n     | M n | M n
-[base](base.sls)                                    | M n   | M n     | M n | M n
-[kube-client-tools](kube-client-tools.sls)          | M     | M       | M   | M
-
-
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/saltbase/salt/README.md?pixel)]()
diff --git a/cluster/saltbase/salt/base.sls b/cluster/saltbase/salt/base.sls
deleted file mode 100644
index c9ccdf5a84c..00000000000
--- a/cluster/saltbase/salt/base.sls
+++ /dev/null
@@ -1,46 +0,0 @@
-pkg-core:
-  pkg.installed:
-    - names:
-      - curl
-      - ebtables
-{% if grains['os_family'] == 'RedHat' %}
-      - python
-      - git
-      - socat
-{% else %}
-      - apt-transport-https
-      - python-apt
-      - nfs-common
-      - socat
-{% endif %}
-# Ubuntu installs netcat-openbsd by default, but on GCE/Debian netcat-traditional is installed.
-# They behave slightly differently.
-# For sanity, we try to make sure we have the same netcat on all OSes (#15166)
-{% if grains['os'] == 'Ubuntu' %}
-      - netcat-traditional
-{% endif %}
-# Make sure git is installed for mounting git volumes
-{% if grains['os'] == 'Ubuntu' %}
-      - git
-{% endif %}
-
-/usr/local/share/doc/kubernetes:
-  file.directory:
-    - user: root
-    - group: root
-    - mode: 755
-    - makedirs: True
-
-/usr/local/share/doc/kubernetes/LICENSES:
-  file.managed:
-    - source: salt://kube-docs/LICENSES
-    - user: root
-    - group: root
-    - mode: 644
-
-/usr/local/share/doc/kubernetes/kubernetes-src.tar.gz:
-  file.managed:
-    - source: salt://kube-docs/kubernetes-src.tar.gz
-    - user: root
-    - group: root
-    - mode: 644
diff --git a/cluster/saltbase/salt/calico/OWNERS b/cluster/saltbase/salt/calico/OWNERS
deleted file mode 100644
index ddd12a032ae..00000000000
--- a/cluster/saltbase/salt/calico/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-approvers:
-- bowei
-- dnardo
-reviewers:
-- bowei
-- dnardo
diff --git a/cluster/saltbase/salt/calico/node.sls b/cluster/saltbase/salt/calico/node.sls
deleted file mode 100644
index dca8a371dae..00000000000
--- a/cluster/saltbase/salt/calico/node.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-{% if pillar.get('network_policy_provider', '').lower() == 'calico' %}
-
-ip6_tables:
-  kmod.present
-
-xt_set:
-  kmod.present
-
-{% endif -%}
diff --git a/cluster/saltbase/salt/cluster-autoscaler/OWNERS b/cluster/saltbase/salt/cluster-autoscaler/OWNERS
deleted file mode 100644
index eb31288f960..00000000000
--- a/cluster/saltbase/salt/cluster-autoscaler/OWNERS
+++ /dev/null
@@ -1,12 +0,0 @@
-reviewers:
-  - mwielgus
-  - jszczepkowski
-  - MaciekPytel
-  - aleksandra-malinowska 
-  - bskiba
-approvers:
-  - mwielgus
-  - jszczepkowski
-  - MaciekPytel
-  - aleksandra-malinowska 
-  - bskiba
diff --git a/cluster/saltbase/salt/cluster-autoscaler/init.sls b/cluster/saltbase/salt/cluster-autoscaler/init.sls
deleted file mode 100644
index cf4b042ef2f..00000000000
--- a/cluster/saltbase/salt/cluster-autoscaler/init.sls
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copy autoscaler manifest to manifests folder for master.
-# The ordering of salt states for service docker, kubelet and
-# master-addon below is very important to avoid the race between
-# salt restart docker or kubelet and kubelet start master components.
-# Please see http://issue.k8s.io/10122#issuecomment-114566063
-# for detail explanation on this very issue.
-
-/etc/kubernetes/manifests/cluster-autoscaler.manifest:
-  file.managed:
-    - source: salt://cluster-autoscaler/cluster-autoscaler.manifest
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - dir_mode: 755
-    - require:
-      - service: docker
-      - service: kubelet
-
-/var/log/cluster-autoscaler.log:
-  file.managed:
-    - user: root
-    - group: root
-    - mode: 644
diff --git a/cluster/saltbase/salt/cni/OWNERS b/cluster/saltbase/salt/cni/OWNERS
deleted file mode 100644
index b09f54100b6..00000000000
--- a/cluster/saltbase/salt/cni/OWNERS
+++ /dev/null
@@ -1,8 +0,0 @@
-approvers:
-- bowei
-- dnardo
-- freehan
-reviewers:
-- bowei
-- dnardo
-- freehan
diff --git a/cluster/saltbase/salt/cni/init.sls b/cluster/saltbase/salt/cni/init.sls
deleted file mode 100644
index 14f26927fef..00000000000
--- a/cluster/saltbase/salt/cni/init.sls
+++ /dev/null
@@ -1,26 +0,0 @@
-/home/kubernetes:
-  file.directory:
-    - user: root
-    - group: root
-    - mode: 755
-    - makedirs: True
-
-/etc/cni/net.d:
-  file.directory:
-    - user: root
-    - group: root
-    - mode: 755
-    - makedirs: True
-
-# These are all available CNI network plugins.
-cni-tar:
-  archive:
-    - extracted
-    - user: root
-    - name: /home/kubernetes/bin
-    - makedirs: True
-    - source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.6.0.tgz
-    - tar_options: v
-    - source_hash: md5=9534876FAE7DBE813CDAB404DC1F9219
-    - archive_format: tar
-    - if_missing: /home/kubernetes/bin
diff --git a/cluster/saltbase/salt/debian-auto-upgrades/20auto-upgrades b/cluster/saltbase/salt/debian-auto-upgrades/20auto-upgrades
deleted file mode 100644
index 2bb25d7053b..00000000000
--- a/cluster/saltbase/salt/debian-auto-upgrades/20auto-upgrades
+++ /dev/null
@@ -1,4 +0,0 @@
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-APT::Periodic::AutocleanInterval "7";
diff --git a/cluster/saltbase/salt/debian-auto-upgrades/init.sls b/cluster/saltbase/salt/debian-auto-upgrades/init.sls
deleted file mode 100644
index 79e28a6820f..00000000000
--- a/cluster/saltbase/salt/debian-auto-upgrades/init.sls
+++ /dev/null
@@ -1,13 +0,0 @@
-{% if grains['os_family'] == 'Debian' %}
-unattended-upgrades:
-  pkg.installed
-
-'/etc/apt/apt.conf.d/20auto-upgrades':
-  file.managed:
-    - source: salt://debian-auto-upgrades/20auto-upgrades
-    - user: root
-    - group: root
-    - mode: 644
-    - require:
-      - pkg: unattended-upgrades
-{% endif %}
diff --git a/cluster/saltbase/salt/docker/default b/cluster/saltbase/salt/docker/default
deleted file mode 100644
index 706f082a521..00000000000
--- a/cluster/saltbase/salt/docker/default
+++ /dev/null
@@ -1,8 +0,0 @@
-{% set docker_opts = "" -%}
-{% if grains.docker_opts is defined and grains.docker_opts -%}
-  {% set docker_opts = grains.docker_opts -%}
-{% endif -%}
-
-DOCKER_OPTS='{{docker_opts}}'
-OPTIONS='{{docker_opts}}'
-DOCKER_CERT_PATH=/etc/docker
diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults
deleted file mode 100644
index 260791cf18f..00000000000
--- a/cluster/saltbase/salt/docker/docker-defaults
+++ /dev/null
@@ -1,18 +0,0 @@
-{% set grains_opts = grains.get('docker_opts', '') -%}
-{% set e2e_opts = '' -%}
-{% if pillar.get('e2e_storage_test_environment', '').lower() == 'true' -%}
-{% set e2e_opts = '-s devicemapper' -%}
-{% endif -%}
-{% set bridge_opts = "--bridge=cbr0" %}
-{% if pillar.get('network_provider', '').lower() == 'kubenet' %}
-  {% set bridge_opts = "" %}
-{% endif -%}
-{% if pillar.get('network_provider', '').lower() == 'cni' %}
-  {% set bridge_opts = "" %}
-{% endif -%}
-{% set log_level = "--log-level=warn" -%}
-{% if pillar['docker_test_log_level'] is defined -%}
-  {% set log_level = pillar['docker_test_log_level'] -%}
-{% endif -%}
-DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false {{log_level}}"
-DOCKER_NOFILE=1000000
diff --git a/cluster/saltbase/salt/docker/docker-healthcheck b/cluster/saltbase/salt/docker/docker-healthcheck
deleted file mode 100755
index 2ff3b8942b8..00000000000
--- a/cluster/saltbase/salt/docker/docker-healthcheck
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# 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 script is intended to be run periodically, to check the health
-# of docker.  If it detects a failure, it will restart docker using systemctl.
-
-if timeout 10 docker version > /dev/null; then
-  exit 0
-fi
-
-echo "docker failed"
-echo "Giving docker 30 seconds grace before restarting"
-sleep 30
-
-if timeout 10 docker version > /dev/null; then
-  echo "docker recovered"
-  exit 0
-fi
-
-echo "docker still down; triggering docker restart"
-systemctl restart docker
-
-echo "Waiting 60 seconds to give docker time to start"
-sleep 60
-
-if timeout 10 docker version > /dev/null; then
-  echo "docker recovered"
-  exit 0
-fi
-
-echo "docker still failing"
diff --git a/cluster/saltbase/salt/docker/docker-healthcheck.service b/cluster/saltbase/salt/docker/docker-healthcheck.service
deleted file mode 100644
index b4ecfaf8f72..00000000000
--- a/cluster/saltbase/salt/docker/docker-healthcheck.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Run docker-healthcheck once
-
-[Service]
-Type=oneshot
-ExecStart=/opt/kubernetes/helpers/docker-healthcheck
-
-[Install]
-WantedBy=multi-user.target
diff --git a/cluster/saltbase/salt/docker/docker-healthcheck.timer b/cluster/saltbase/salt/docker/docker-healthcheck.timer
deleted file mode 100644
index 3d252e4464e..00000000000
--- a/cluster/saltbase/salt/docker/docker-healthcheck.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Trigger docker-healthcheck periodically
-
-[Timer]
-OnUnitInactiveSec=10s
-Unit=docker-healthcheck.service
-
-[Install]
-WantedBy=multi-user.target
diff --git a/cluster/saltbase/salt/docker/docker-prestart b/cluster/saltbase/salt/docker/docker-prestart
deleted file mode 100755
index 0ac57967770..00000000000
--- a/cluster/saltbase/salt/docker/docker-prestart
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# 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 script is intended to be run before we start Docker.
-
-# cleanup docker network checkpoint to avoid running into known issue
-# of docker (https://github.com/docker/docker/issues/18283)
-rm -rf /var/lib/docker/network
-
diff --git a/cluster/saltbase/salt/docker/docker.list b/cluster/saltbase/salt/docker/docker.list
deleted file mode 100644
index 02fb6ad99e9..00000000000
--- a/cluster/saltbase/salt/docker/docker.list
+++ /dev/null
@@ -1 +0,0 @@
-deb https://apt.dockerproject.org/repo debian-{{ salt['grains.get']('oscodename') }} main
diff --git a/cluster/saltbase/salt/docker/docker.service b/cluster/saltbase/salt/docker/docker.service
deleted file mode 100644
index a5e02c9f6e5..00000000000
--- a/cluster/saltbase/salt/docker/docker.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=Docker Application Container Engine
-Documentation=https://docs.docker.com
-After=network.target docker.socket
-Requires=docker.socket
-
-[Service]
-Type=notify
-EnvironmentFile={{ environment_file }}
-ExecStart=/usr/bin/docker daemon -H fd:// "$DOCKER_OPTS"
-MountFlags=slave
-LimitNOFILE=1048576
-LimitNPROC=1048576
-LimitCORE=infinity
-Restart=always
-RestartSec=2s
-StartLimitInterval=0
-ExecStartPre=/opt/kubernetes/helpers/docker-prestart
-
-[Install]
-WantedBy=multi-user.target
diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls
deleted file mode 100644
index 23ab4cfba1b..00000000000
--- a/cluster/saltbase/salt/docker/init.sls
+++ /dev/null
@@ -1,493 +0,0 @@
-{% if pillar.get('is_systemd') %}
-  {% set environment_file = '/etc/sysconfig/docker' %}
-{% else %}
-  {% set environment_file = '/etc/default/docker' %}
-{% endif %}
-
-bridge-utils:
-  pkg.installed
-
-{% if grains.os_family == 'RedHat' %}
-
-{{ environment_file }}:
-  file.managed:
-    - source: salt://docker/default
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-
-{% if grains.cloud is defined and grains.cloud == 'openstack' %}
-
-cbr0:
-  # workaround https://github.com/saltstack/salt/issues/20570
-  kmod.present:
-    - name: bridge
-
-  network.managed:
-    - enabled: True
-    - type: bridge
-    - proto: none
-    - ports: none
-    - bridge: cbr0
-    - delay: 0
-    - bypassfirewall: True
-    - require_in:
-      - service: docker
-    - require:
-      - kmod: cbr0
-{% endif %}
-
-{% if (grains.os == 'Fedora' and grains.osrelease_info[0] >= 22) or (grains.os == 'CentOS' and grains.osrelease_info[0] >= 7) %}
-
-docker:
-  pkg:
-    - installed
-  service.running:
-    - enable: True
-    - require:
-      - pkg: docker
-    - watch:
-      - file: {{ environment_file }}
-      - pkg: docker
-
-{% else %}
-
-docker-io:
-  pkg:
-    - installed
-
-docker:
-  service.running:
-    - enable: True
-    - require:
-      - pkg: docker-io
-    - watch:
-      - file: {{ environment_file }}
-      - pkg: docker-io
-
-{% endif %}
-{% elif grains.cloud is defined and grains.cloud == 'azure-legacy' %}
-
-{% if pillar.get('is_systemd') %}
-
-{{ pillar.get('systemd_system_path') }}/docker.service:
-  file.managed:
-    - source: salt://docker/docker.service
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - defaults:
-        environment_file: {{ environment_file }}
-
-# The docker service.running block below doesn't work reliably
-# Instead we run our script which e.g. does a systemd daemon-reload
-# But we keep the service block below, so it can be used by dependencies
-# TODO: Fix this
-fix-service-docker:
-  cmd.wait:
-    - name: /opt/kubernetes/helpers/services bounce docker
-    - watch:
-      - file: {{ pillar.get('systemd_system_path') }}/docker.service
-      - file: {{ environment_file }}
-{% endif %}
-
-{{ environment_file }}:
-  file.managed:
-    - source: salt://docker/docker-defaults
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - require:
-      - pkg: docker-engine
-
-apt-key:
-  pkgrepo.managed:
-    - humanname: Dotdeb
-    - name: deb https://apt.dockerproject.org/repo ubuntu-trusty main
-    - dist: ubuntu-trusty
-    - file: /etc/apt/sources.list.d/docker.list
-    - keyid: 58118E89F3A912897C070ADBF76221572C52609D
-    - keyserver: hkp://p80.pool.sks-keyservers.net:80
-
-lxc-docker:
-  pkg:
-    - purged
-
-docker-io:
-  pkg:
-    - purged
-
-cbr0:
-  network.managed:
-    - enabled: True
-    - type: bridge
-{% if grains['roles'][0] == 'kubernetes-pool' %}
-    - proto: none
-{% else %}
-    - proto: dhcp
-{% endif %}
-    - ports: none
-    - bridge: cbr0
-{% if grains['roles'][0] == 'kubernetes-pool' %}
-    - ipaddr: {{ grains['cbr-cidr'] }}
-{% endif %}
-    - delay: 0
-    - bypassfirewall: True
-    - require_in:
-      - service: docker
-
-docker-engine:
-   pkg:
-     - installed
-     - require:
-       - pkgrepo: 'apt-key'
-
-docker:
-   service.running:
-     - enable: True
-     - require:
-       - file: {{ environment_file }}
-     - watch:
-       - file: {{ environment_file }}
-
-{% elif grains.cloud is defined and grains.cloud in ['photon-controller'] and grains.os == 'Debian' and grains.osrelease_info[0] >=8 %}
-
-{% if pillar.get('is_systemd') %}
-
-/opt/kubernetes/helpers/docker-prestart:
-  file.managed:
-    - source: salt://docker/docker-prestart
-    - user: root
-    - group: root
-    - mode: 755
-
-{{ pillar.get('systemd_system_path') }}/docker.service:
-  file.managed:
-    - source: salt://docker/docker.service
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - defaults:
-        environment_file: {{ environment_file }}
-    - require:
-      - file: /opt/kubernetes/helpers/docker-prestart
-      - pkg: docker-engine
-
-# The docker service.running block below doesn't work reliably
-# Instead we run our script which e.g. does a systemd daemon-reload
-# But we keep the service block below, so it can be used by dependencies
-# TODO: Fix this
-fix-service-docker:
-  cmd.wait:
-    - name: /opt/kubernetes/helpers/services bounce docker
-    - watch:
-      - file: {{ pillar.get('systemd_system_path') }}/docker.service
-      - file: {{ environment_file }}
-{% endif %}
-
-{{ environment_file }}:
-  file.managed:
-    - source: salt://docker/docker-defaults
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - require:
-      - pkg: docker-engine
-
-apt-key:
-   cmd.run:
-     - name: 'apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D'
-     - unless: 'apt-key finger | grep "5811 8E89"'
-
-apt-update:
-  cmd.run:
-    - name: '/usr/bin/apt-get update -y'
-    - require:
-       - cmd : 'apt-key'
-
-lxc-docker:
-  pkg:
-    - purged
-
-docker-io:
-  pkg:
-    - purged
-
-cbr0:
-  network.managed:
-    - enabled: True
-    - type: bridge
-    - proto: dhcp
-    - ports: none
-    - bridge: cbr0
-    - delay: 0
-    - bypassfirewall: True
-    - require_in:
-      - service: docker
-
-/etc/apt/sources.list.d/docker.list:
-  file.managed:
-    - source: salt://docker/docker.list
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - require:
-      - cmd: 'apt-update'
-
-# restricting docker version to 1.9. with older version of docker we are facing
-# issue https://github.com/docker/docker/issues/18793.
-# newer version of docker 1.10.0 is not well tested yet.
-# full comments: https://github.com/kubernetes/kubernetes/pull/20851
-docker-engine:
-   pkg:
-     - installed
-     - version: 1.9.*
-     - require:
-       - file: /etc/apt/sources.list.d/docker.list
-docker:
-   service.running:
-     - enable: True
-     - require:
-       - file: {{ environment_file }}
-     - watch:
-       - file: {{ environment_file }}
-
-{% else %}
-
-{% if grains.cloud is defined
-   and grains.cloud == 'gce' %}
-# The default GCE images have ip_forwarding explicitly set to 0.
-# Here we take care of commenting that out.
-/etc/sysctl.d/11-gce-network-security.conf:
-  file.replace:
-    - pattern: '^net.ipv4.ip_forward=0'
-    - repl: '# net.ipv4.ip_forward=0'
-{% endif %}
-
-# Work around Salt #18089: https://github.com/saltstack/salt/issues/18089
-/etc/sysctl.d/99-salt.conf:
-  file.touch
-
-# TODO: This should really be based on network strategy instead of os_family
-net.ipv4.ip_forward:
-  sysctl.present:
-    - value: 1
-
-{% if pillar.get('softlockup_panic', '').lower() == 'true' %}
-# TODO(dchen1107) Remove this once kernel.softlockup_panic is built into the CVM image.
-/etc/sysctl.conf:
-  file.append:
-    - text:
-      - "kernel.softlockup_panic = 1"
-      - "kernel.softlockup_all_cpu_backtrace = 1"
-
-'sysctl-reload':
-  cmd.run:
-    - name: 'sysctl --system'
-    - unless: 'sysctl -a | grep "kernel.softlockup_panic = 1"'
-{% endif %}
- 
-{{ environment_file }}:
-  file.managed:
-    - source: salt://docker/docker-defaults
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-
-# Docker is on the ContainerVM image by default. The following
-# variables are provided for other cloud providers, and for testing and dire circumstances, to allow
-# overriding the Docker version that's in a ContainerVM image.
-#
-# To change:
-#
-# 1. Find new deb name at:
-#    http://apt.dockerproject.org/repo/pool/main/d/docker-engine
-# 2. Download based on that:
-#    curl -O http://apt.dockerproject.org/repo/pool/main/d/docker-engine/<deb>
-# 3. Upload to GCS:
-#    gsutil cp <deb> gs://kubernetes-release/docker/<deb>
-# 4. Make it world readable:
-#    gsutil acl ch -R -g all:R gs://kubernetes-release/docker/<deb>
-# 5. Get a hash of the deb:
-#    shasum <deb>
-# 6. Update override_deb, override_deb_sha1, override_docker_ver with new
-#    deb name, new hash and new version
-
-{% set storage_base='https://storage.googleapis.com/kubernetes-release/docker/' %}
-
-{% set override_deb_url='' %}
-
-{% if grains.get('cloud', '') == 'gce'
-   and grains.get('os_family', '') == 'Debian'
-   and grains.get('oscodename', '') == 'wheezy' -%}
-{% set docker_pkg_name='' %}
-{% set override_deb='' %}
-{% set override_deb_sha1='' %}
-{% set override_docker_ver='' %}
-
-{% elif grains.get('cloud', '') == 'gce'
-   and grains.get('os_family', '') == 'Debian'
-   and grains.get('oscodename', '') == 'jessie' -%}
-{% set docker_pkg_name='' %}
-{% set override_deb='' %}
-{% set override_deb_sha1='' %}
-{% set override_docker_ver='' %}
-
-{% else %}
-{% set docker_pkg_name='lxc-docker-1.7.1' %}
-{% set override_docker_ver='1.7.1' %}
-{% set override_deb='lxc-docker-1.7.1_1.7.1_amd64.deb' %}
-{% set override_deb_sha1='81abef31dd2c616883a61f85bfb294d743b1c889' %}
-{% endif %}
-
-{% if override_deb_url == '' %}
-{% set override_deb_url=storage_base + override_deb %}
-{% endif %}
-
-{% if override_docker_ver != '' %}
-purge-old-docker-package:
-  pkg.removed:
-    - pkgs:
-      - lxc-docker-1.6.2
-
-/var/cache/docker-install/{{ override_deb }}:
-  file.managed:
-    - source: {{ override_deb_url }}
-    - source_hash: sha1={{ override_deb_sha1 }}
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-
-# Drop the license file into /usr/share so that everything is crystal clear.
-/usr/share/doc/docker/apache.txt:
-  file.managed:
-    - source: {{ storage_base }}apache2.txt
-    - source_hash: sha1=2b8b815229aa8a61e483fb4ba0588b8b6c491890
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-
-libltdl7:
-  pkg.installed
-
-docker-upgrade:
-  cmd.run:
-    - name: /opt/kubernetes/helpers/pkg install-no-start {{ docker_pkg_name }} {{ override_docker_ver }} /var/cache/docker-install/{{ override_deb }}
-    - require:
-      - file: /var/cache/docker-install/{{ override_deb }}
-      - pkg: libltdl7
-
-{% endif %} # end override_docker_ver != ''
-
-{% if pillar.get('is_systemd') %}
-
-/opt/kubernetes/helpers/docker-prestart:
-  file.managed:
-    - source: salt://docker/docker-prestart
-    - user: root
-    - group: root
-    - mode: 755
-
-# Default docker systemd unit file doesn't use an EnvironmentFile; replace it with one that does.
-{{ pillar.get('systemd_system_path') }}/docker.service:
-  file.managed:
-    - source: salt://docker/docker.service
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - defaults:
-        environment_file: {{ environment_file }}
-    - require:
-      - file: /opt/kubernetes/helpers/docker-prestart
-
-# The docker service.running block below doesn't work reliably
-# Instead we run our script which e.g. does a systemd daemon-reload
-# But we keep the service block below, so it can be used by dependencies
-# TODO: Fix this
-fix-service-docker:
-  cmd.wait:
-    - name: /opt/kubernetes/helpers/services enable docker
-    - watch:
-      - file: {{ pillar.get('systemd_system_path') }}/docker.service
-      - file: {{ environment_file }}
-{% if override_docker_ver != '' %}
-    - require:
-      - cmd: docker-upgrade
-{% endif %}
-
-/opt/kubernetes/helpers/docker-healthcheck:
-  file.managed:
-    - source: salt://docker/docker-healthcheck
-    - user: root
-    - group: root
-    - mode: 755
-
-{{ pillar.get('systemd_system_path') }}/docker-healthcheck.service:
-  file.managed:
-    - source: salt://docker/docker-healthcheck.service
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-
-{{ pillar.get('systemd_system_path') }}/docker-healthcheck.timer:
-  file.managed:
-    - source: salt://docker/docker-healthcheck.timer
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-
-# Tell systemd to load the timer
-fix-systemd-docker-healthcheck-timer:
-  cmd.wait:
-    - name: /opt/kubernetes/helpers/services bounce docker-healthcheck.timer
-    - watch:
-      - file: {{ pillar.get('systemd_system_path') }}/docker-healthcheck.timer
-
-# Trigger a first run of docker-healthcheck; needed because the timer fires 10s after the previous run.
-fix-systemd-docker-healthcheck-service:
-  cmd.wait:
-    - name: /opt/kubernetes/helpers/services bounce docker-healthcheck.service
-    - watch:
-      - file: {{ pillar.get('systemd_system_path') }}/docker-healthcheck.service
-    - require:
-      - cmd: fix-service-docker
-
-{% endif %}
-
-docker:
-  service.running:
-    - enable: True
-# If we put a watch on this, salt will try to start the service.
-# We put the watch on the fixer instead
-{% if not pillar.get('is_systemd') %}
-    - watch:
-      - file: {{ environment_file }}
-{% if override_docker_ver != '' %}
-      - cmd: docker-upgrade
-{% endif %}
-{% endif %}
-    - require:
-      - file: {{ environment_file }}
-{% if override_docker_ver != '' %}
-      - cmd: docker-upgrade
-{% endif %}
-{% if pillar.get('is_systemd') %}
-      - cmd: fix-service-docker
-{% endif %}
-{% endif %} # end grains.os_family != 'RedHat'
diff --git a/cluster/saltbase/salt/e2e-image-puller/init.sls b/cluster/saltbase/salt/e2e-image-puller/init.sls
deleted file mode 100644
index f93102a4566..00000000000
--- a/cluster/saltbase/salt/e2e-image-puller/init.sls
+++ /dev/null
@@ -1,12 +0,0 @@
-/etc/kubernetes/manifests/e2e-image-puller.manifest:
-  file.managed:
-    - source: salt://e2e-image-puller/e2e-image-puller.manifest
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - dir_mode: 755
-    - require:
-      - service: docker
-      - service: kubelet
diff --git a/cluster/saltbase/salt/e2e/init.sls b/cluster/saltbase/salt/e2e/init.sls
deleted file mode 100644
index 83326494651..00000000000
--- a/cluster/saltbase/salt/e2e/init.sls
+++ /dev/null
@@ -1,28 +0,0 @@
-e2e:
-  # Install various packages required by e2e tests to all hosts.
-  pkg.installed:
-    - refresh: true
-    - pkgs:
-      - targetcli
-      - ceph
-{% if grains['os_family'] == 'RedHat' %}
-      - glusterfs-fuse
-      - rbd-fuse
-      - iscsi-initiator-utils
-      - nfs-utils
-{% else %}
-      - glusterfs-client
-      - open-iscsi
-      - iscsitarget-dkms
-      - nfs-common
-{% endif %}
-
-
-
-{% if grains['os_family'] == 'Debian' %}
-# On Debian, re-start open-iscsi to generate unique
-# /etc/iscsi/initiatorname.iscsi
-open-iscsi:
-  cmd.run:
-    - name: 'service open-iscsi restart'
-{% endif %}
diff --git a/cluster/saltbase/salt/etcd/init.sls b/cluster/saltbase/salt/etcd/init.sls
deleted file mode 100644
index 6802ad4ca38..00000000000
--- a/cluster/saltbase/salt/etcd/init.sls
+++ /dev/null
@@ -1,83 +0,0 @@
-# Early configurations of Kubernetes ran etcd on the host and as part of a migration step, we began to delete the host etcd
-# It's possible though that the host has configured a separate etcd to configure other services like Flannel
-# In that case, we do not want Salt to remove or stop the host service
-# Note: its imperative that the host installed etcd not conflict with the Kubernetes managed etcd
-{% if grains['keep_host_etcd'] is not defined %}
-
-delete_etc_etcd_dir:
-  file.absent:
-    - name: /etc/etcd
-
-delete_etcd_conf:
-  file.absent:
-    - name: /etc/etcd/etcd.conf
-
-delete_etcd_default:
-  file.absent:
-    - name: /etc/default/etcd
-
-{% if pillar.get('is_systemd') %}
-delete_etcd_service_file:
-  file.absent:
-    - name: {{ pillar.get('systemd_system_path') }}/etcd.service
-{% endif %}
-
-delete_etcd_initd:
-  file.absent:
-    - name: /etc/init.d/etcd
-
-#stop legacy etcd_service
-stop_etcd-service:
-  service.dead:
-    - name: etcd
-    - enable: None
-
-{% endif %}
-
-touch /var/log/etcd.log:
-  cmd.run:
-    - creates: /var/log/etcd.log
-
-touch /var/log/etcd-events.log:
-  cmd.run:
-    - creates: /var/log/etcd-events.log
-
-/var/etcd:
-  file.directory:
-    - user: root
-    - group: root
-    - dir_mode: 700
-    - recurse:
-      - user
-      - group
-      - mode
-
-/etc/kubernetes/manifests/etcd.manifest:
-  file.managed:
-    - source: salt://etcd/etcd.manifest
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - dir_mode: 755
-    - context:
-        suffix: ""
-        port: 2379
-        server_port: 2380
-        cpulimit: '"200m"'
-
-/etc/kubernetes/manifests/etcd-events.manifest:
-  file.managed:
-    - source: salt://etcd/etcd.manifest
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - dir_mode: 755
-    - context:
-        suffix: "-events"
-        port: 4002
-        server_port: 2381
-        cpulimit: '"100m"'
diff --git a/cluster/saltbase/salt/generate-cert/init.sls b/cluster/saltbase/salt/generate-cert/init.sls
deleted file mode 100644
index 4543239afe1..00000000000
--- a/cluster/saltbase/salt/generate-cert/init.sls
+++ /dev/null
@@ -1,37 +0,0 @@
-{% set master_extra_sans=grains.get('master_extra_sans', '') %}
-{% if grains.cloud is defined and grains.cloud == 'gce' %}
-  {% set cert_ip='_use_gce_external_ip_' %}
-{% endif %}
-
-# If there is a pillar defined, override any defaults.
-{% if pillar['cert_ip'] is defined %}
-  {% set cert_ip=pillar['cert_ip'] %}
-{% endif %}
-
-{% set certgen="make-cert.sh" %}
-{% if cert_ip is defined %}
-  {% set certgen="make-ca-cert.sh" %}
-{% endif %}
-
-openssl:
-  pkg.installed: []
-
-kube-cert:
-  group.present:
-    - system: True
-
-kubernetes-cert:
-  cmd.script:
-    - unless: test -f /srv/kubernetes/server.cert
-    - source: salt://generate-cert/{{certgen}}
-{% if cert_ip is defined %}
-    - args: {{cert_ip}} {{master_extra_sans}}
-    - require:
-      - pkg: curl
-{% endif %}
-    - cwd: /
-    - user: root
-    - group: root
-    - shell: /bin/bash
-    - require:
-      - pkg: openssl
diff --git a/cluster/saltbase/salt/generate-cert/make-cert.sh b/cluster/saltbase/salt/generate-cert/make-cert.sh
deleted file mode 100755
index ec17d11c28a..00000000000
--- a/cluster/saltbase/salt/generate-cert/make-cert.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014 The Kubernetes Authors.
-#
-# 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.
-
-cert_dir=${CERT_DIR:-/srv/kubernetes}
-cert_group=${CERT_GROUP:-kube-cert}
-
-mkdir -p "$cert_dir"
-
-openssl req -new -newkey rsa:4096 -days 365 -nodes -x509 \
-  -subj "/CN=kubernetes.invalid/O=Kubernetes" \
-  -keyout "${cert_dir}/server.key" -out "${cert_dir}/server.cert"
-chgrp $cert_group "${cert_dir}/server.key" "${cert_dir}/server.cert"
-chmod 660 "${cert_dir}/server.key" "${cert_dir}/server.cert"
diff --git a/cluster/saltbase/salt/kube-addons/init.sls b/cluster/saltbase/salt/kube-addons/init.sls
deleted file mode 100644
index 923a711a6b8..00000000000
--- a/cluster/saltbase/salt/kube-addons/init.sls
+++ /dev/null
@@ -1,215 +0,0 @@
-addon-dir-delete:
-  file.absent:
-    - name: /etc/kubernetes/addons
-
-addon-dir-create:
-  file.directory:
-    - name: /etc/kubernetes/addons
-    - user: root
-    - group: root
-    - mode: 0755
-    - require:
-        - file: addon-dir-delete
-
-{% if pillar.get('enable_cluster_monitoring', '').lower() == 'influxdb' %}
-/etc/kubernetes/addons/cluster-monitoring/influxdb:
-  file.recurse:
-    - source: salt://kube-addons/cluster-monitoring/influxdb
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - template: jinja
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_l7_loadbalancing', '').lower() == 'glbc' %}
-/etc/kubernetes/addons/cluster-loadbalancing/glbc:
-  file.recurse:
-    - source: salt://kube-addons/cluster-loadbalancing/glbc
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - template: jinja
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_monitoring', '').lower() == 'google' %}
-/etc/kubernetes/addons/cluster-monitoring/google:
-  file.recurse:
-    - source: salt://kube-addons/cluster-monitoring/google
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - template: jinja
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_monitoring', '').lower() == 'stackdriver' %}
-/etc/kubernetes/addons/cluster-monitoring/stackdriver:
-  file.recurse:
-    - source: salt://kube-addons/cluster-monitoring/stackdriver
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - template: jinja
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_monitoring', '').lower() == 'standalone' %}
-/etc/kubernetes/addons/cluster-monitoring/standalone:
-  file.recurse:
-    - source: salt://kube-addons/cluster-monitoring/standalone
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - template: jinja
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_monitoring', '').lower() == 'googleinfluxdb' %}
-/etc/kubernetes/addons/cluster-monitoring/googleinfluxdb:
-  file.recurse:
-    - source: salt://kube-addons/cluster-monitoring
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - exclude_pat: E@(^.+heapster-controller\.yaml$|^.+heapster-controller\.json$)
-    - template: jinja
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_dns', '').lower() == 'true' %}
-/etc/kubernetes/addons/dns/kube-dns.yaml:
-  file.managed:
-    - source: salt://kube-addons/dns/kube-dns.yaml.in
-    - template: jinja
-    - group: root
-    - dir_mode: 755
-    - makedirs: True
-{% endif %}
-
-{% if pillar.get('enable_dns_horizontal_autoscaler', '').lower() == 'true'
-   and pillar.get('enable_cluster_dns', '').lower() == 'true' %}
-/etc/kubernetes/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml:
-  file.managed:
-    - source: salt://kube-addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml
-    - user: root
-    - group: root
-    - file_mode: 644
-    - makedirs: True
-{% endif %}
-
-{% if pillar.get('enable_cluster_registry', '').lower() == 'true' %}
-/etc/kubernetes/addons/registry/registry-svc.yaml:
-  file.managed:
-    - source: salt://kube-addons/registry/registry-svc.yaml
-    - user: root
-    - group: root
-    - file_mode: 644
-    - makedirs: True
-
-/etc/kubernetes/addons/registry/registry-rc.yaml:
-  file.managed:
-    - source: salt://kube-addons/registry/registry-rc.yaml
-    - user: root
-    - group: root
-    - file_mode: 644
-    - makedirs: True
-
-/etc/kubernetes/addons/registry/registry-pv.yaml:
-  file.managed:
-    - source: salt://kube-addons/registry/registry-pv.yaml.in
-    - template: jinja
-    - user: root
-    - group: root
-    - file_mode: 644
-    - makedirs: True
-
-/etc/kubernetes/addons/registry/registry-pvc.yaml:
-  file.managed:
-    - source: salt://kube-addons/registry/registry-pvc.yaml.in
-    - template: jinja
-    - user: root
-    - group: root
-    - file_mode: 644
-    - makedirs: True
-{% endif %}
-
-{% if pillar.get('enable_node_logging', '').lower() == 'true'
-   and 'logging_destination' in pillar
-   and pillar.get('enable_cluster_logging', '').lower() == 'true' %}
-/etc/kubernetes/addons/fluentd-{{ pillar.get('logging_destination') }}:
-  file.recurse:
-    - source: salt://kube-addons/fluentd-{{ pillar.get('logging_destination') }}
-    - include_pat: E@^.+\.yaml$
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_metadata_proxy', '').lower() == 'true' %}
-/etc/kubernetes/addons/metadata-proxy/gce:
-  file.recurse:
-    - source: salt://kube-addons/metadata-proxy/gce
-    - include_pat: E@^.+\.yaml$
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_pod_security_policy', '').lower() == 'true' %}
-/etc/kubernetes/addons/podsecuritypolicies:
-  file.recurse:
-    - source: salt://kube-addons/podsecuritypolicies
-    - include_pat: E@^.+\.yaml$
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_cluster_ui', '').lower() == 'true' %}
-/etc/kubernetes/addons/dashboard:
-  file.recurse:
-    - source: salt://kube-addons/dashboard
-    - include_pat: E@^.+\.yaml$
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
-
-{% if pillar.get('enable_node_problem_detector', '').lower() == 'daemonset' %}
-/etc/kubernetes/addons/node-problem-detector/npd.yaml:
-  file.managed:
-    - source: salt://kube-addons/node-problem-detector/npd.yaml
-    - user: root
-    - group: root
-    - file_mode: 644
-    - makedirs: True
-{% endif %}
-
-/etc/kubernetes/manifests/kube-addon-manager.yaml:
-  file.managed:
-    - source: salt://kube-addons/kube-addon-manager.yaml
-    - user: root
-    - group: root
-    - mode: 755
-
-{% if pillar.get('enable_default_storage_class', '').lower() == 'true' and grains['cloud'] is defined and grains['cloud'] == 'gce' %}
-/etc/kubernetes/addons/storage-class/default.yaml:
-  file.managed:
-    - source: salt://kube-addons/storage-class/{{ grains['cloud'] }}/default.yaml
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: True
-{% endif %}
diff --git a/cluster/saltbase/salt/kube-admission-controls/init.sls b/cluster/saltbase/salt/kube-admission-controls/init.sls
deleted file mode 100644
index 55cfd017805..00000000000
--- a/cluster/saltbase/salt/kube-admission-controls/init.sls
+++ /dev/null
@@ -1,10 +0,0 @@
-{% if 'LimitRanger' in pillar.get('admission_control', '') %}
-/etc/kubernetes/admission-controls/limit-range:
-  file.recurse:
-    - source: salt://kube-admission-controls/limit-range
-    - include_pat: E@(^.+\.yaml$|^.+\.json$)
-    - user: root
-    - group: root
-    - dir_mode: 755
-    - file_mode: 644
-{% endif %}
diff --git a/cluster/saltbase/salt/kube-apiserver/init.sls b/cluster/saltbase/salt/kube-apiserver/init.sls
deleted file mode 100644
index 261fd53ef35..00000000000
--- a/cluster/saltbase/salt/kube-apiserver/init.sls
+++ /dev/null
@@ -1,71 +0,0 @@
-{% if grains['cloud'] is defined and grains.cloud == 'gce' %}
-# TODO: generate and distribute tokens on other cloud providers.
-/srv/kubernetes/known_tokens.csv:
-  file.managed:
-    - source: salt://kube-apiserver/known_tokens.csv
-    - user: root
-    - group: root
-    - mode: 600
-#    - watch_in:
-#      - service: kube-apiserver
-
-/srv/kubernetes/basic_auth.csv:
-  file.managed:
-    - source: salt://kube-apiserver/basic_auth.csv
-    - user: root
-    - group: root
-    - mode: 600
-
-/srv/kubernetes/abac-authz-policy.jsonl:
-  file.managed:
-    - source: salt://kube-apiserver/abac-authz-policy.jsonl
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 600
-{% endif %}
-
-/var/log/kube-apiserver.log:
-  file.managed:
-    - user: root
-    - group: root
-    - mode: 644
-
-/var/log/kube-apiserver-audit.log:
-  file.managed:
-    - user: root
-    - group: root
-    - mode: 644
-
-# Copy kube-apiserver manifest to manifests folder for kubelet.
-# Current containervm image by default has both docker and kubelet
-# running. But during cluster creation stage, docker and kubelet
-# could be overwritten completely, or restarted due to flag changes.
-# The ordering of salt states for service docker, kubelet and
-# master-addon below is very important to avoid the race between
-# salt restart docker or kubelet and kubelet start master components.
-# Without the ordering of salt states, when gce instance boot up,
-# configure-vm.sh will run and download the release. At the end of
-# boot, run-salt will installs kube-apiserver.manifest files to
-# kubelet config directory before the installation of proper version
-# kubelet. Please see
-# http://issue.k8s.io/10122#issuecomment-114566063
-# for detail explanation on this very issue.
-/etc/kubernetes/manifests/kube-apiserver.manifest:
-  file.managed:
-    - source: salt://kube-apiserver/kube-apiserver.manifest
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - dir_mode: 755
-    - require:
-      - service: docker
-      - service: kubelet
-
-#stop legacy kube-apiserver service
-stop_kube-apiserver:
-  service.dead:
-    - name: kube-apiserver
-    - enable: None
diff --git a/cluster/saltbase/salt/kube-client-tools.sls b/cluster/saltbase/salt/kube-client-tools.sls
deleted file mode 100644
index 3c05f117339..00000000000
--- a/cluster/saltbase/salt/kube-client-tools.sls
+++ /dev/null
@@ -1,6 +0,0 @@
-/usr/local/bin/kubectl:
-  file.managed:
-    - source: salt://kube-bins/kubectl
-    - user: root
-    - group: root
-    - mode: 755
diff --git a/cluster/saltbase/salt/kube-controller-manager/init.sls b/cluster/saltbase/salt/kube-controller-manager/init.sls
deleted file mode 100644
index 906ead670e2..00000000000
--- a/cluster/saltbase/salt/kube-controller-manager/init.sls
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copy kube-controller-manager manifest to manifests folder for kubelet.
-# The ordering of salt states for service docker, kubelet and
-# master-addon below is very important to avoid the race between
-# salt restart docker or kubelet and kubelet start master components.
-# Please see http://issue.k8s.io/10122#issuecomment-114566063
-# for detail explanation on this very issue.
-/etc/kubernetes/manifests/kube-controller-manager.manifest:
-  file.managed:
-    - source: salt://kube-controller-manager/kube-controller-manager.manifest
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - dir_mode: 755
-    - require:
-      - service: docker
-      - service: kubelet
-
-/var/log/kube-controller-manager.log:
-  file.managed:
-    - user: root
-    - group: root
-    - mode: 644
-
-stop-legacy-kube_controller_manager:
-  service.dead:
-    - name: kube-controller-manager
-    - enable: None
-
diff --git a/cluster/saltbase/salt/kube-master-addons/init.sls b/cluster/saltbase/salt/kube-master-addons/init.sls
deleted file mode 100644
index 9ae0a8d3396..00000000000
--- a/cluster/saltbase/salt/kube-master-addons/init.sls
+++ /dev/null
@@ -1,52 +0,0 @@
-/etc/kubernetes/kube-master-addons.sh:
-  file.managed:
-    - source: salt://kube-master-addons/kube-master-addons.sh
-    - user: root
-    - group: root
-    - mode: 755
-
-# Used to restart kube-master-addons service each time salt is run
-# Actually, it does not work (the service is not restarted),
-# but master-addon service always terminates after it does it job,
-# so it is (usually) not running and it will be started when
-# salt is run.
-# This salt state is not removed because there is a risk
-# of introducing regression in 1.0. Please remove it afterwards.
-# See also the salt config for kube-addons to see how to restart
-# a service on demand.
-master-docker-image-tags:
-  file.touch:
-    - name: /srv/pillar/docker-images.sls
-
-{% if pillar.get('is_systemd') %}
-
-{{ pillar.get('systemd_system_path') }}/kube-master-addons.service:
-  file.managed:
-    - source: salt://kube-master-addons/kube-master-addons.service
-    - user: root
-    - group: root
-  cmd.wait:
-    - name: /opt/kubernetes/helpers/services bounce kube-master-addons
-    - watch:
-      - file: master-docker-image-tags
-      - file: /etc/kubernetes/kube-master-addons.sh
-      - file: {{ pillar.get('systemd_system_path') }}/kube-master-addons.service
-
-{% else %}
-
-/etc/init.d/kube-master-addons:
-  file.managed:
-    - source: salt://kube-master-addons/initd
-    - user: root
-    - group: root
-    - mode: 755
-
-kube-master-addons:
-  service.running:
-    - enable: True
-    - restart: True
-    - watch:
-      - file: master-docker-image-tags
-      - file: /etc/kubernetes/kube-master-addons.sh
-
-{% endif %}
diff --git a/cluster/saltbase/salt/kube-master-addons/initd b/cluster/saltbase/salt/kube-master-addons/initd
deleted file mode 100644
index 6fef265a936..00000000000
--- a/cluster/saltbase/salt/kube-master-addons/initd
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-#
-### BEGIN INIT INFO
-# Provides:   kube-master-addons
-# Required-Start:    $local_fs $network $syslog docker
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Kubernetes Master Addon Object Manager
-# Description:
-#   Enforces installation of Kubernetes Master Addon Objects
-### END INIT INFO
-
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Kubernetes Master Addon Object Manager"
-NAME=kube-master-addons
-DAEMON_LOG_FILE=/var/log/$NAME.log
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-KUBE_MASTER_ADDONS_SH=/etc/kubernetes/kube-master-addons.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-
-
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-    ${KUBE_MASTER_ADDONS_SH} </dev/null >>${DAEMON_LOG_FILE} 2>&1 &
-    echo $! > ${PIDFILE}
-    disown
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-    kill $(cat ${PIDFILE})
-    rm ${PIDFILE}
-    return
-}
-
-case "$1" in
-  start)
-        log_daemon_msg "Starting $DESC" "$NAME"
-        do_start
-        case "$?" in
-                0|1) log_end_msg 0 || exit 0 ;;
-                2) log_end_msg 1 || exit 1 ;;
-        esac
-        ;;
-  stop)
-        log_daemon_msg "Stopping $DESC" "$NAME"
-        do_stop
-        case "$?" in
-                0|1) log_end_msg 0 ;;
-                2) exit 1 ;;
-        esac
-        ;;
-  status)
-        status_of_proc -p $PIDFILE $KUBE_MASTER_ADDONS_SH $NAME
-        ;;
-
-  restart|force-reload)
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        do_stop
-        case "$?" in
-          0|1)
-                do_start
-                case "$?" in
-                        0) log_end_msg 0 ;;
-                        1) log_end_msg 1 ;; # Old process is still running
-                        *) log_end_msg 1 ;; # Failed to start
-                esac
-                ;;
-          *)
-                # Failed to stop
-                log_end_msg 1
-                ;;
-        esac
-        ;;
-  *)
-        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-        exit 3
-        ;;
-esac
diff --git a/cluster/saltbase/salt/kube-master-addons/kube-master-addons.service b/cluster/saltbase/salt/kube-master-addons/kube-master-addons.service
deleted file mode 100644
index 64858a79578..00000000000
--- a/cluster/saltbase/salt/kube-master-addons/kube-master-addons.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kubernetes-Master Addon Object Manager
-Documentation=https://github.com/kubernetes/kubernetes
-
-[Service]
-ExecStart=/etc/kubernetes/kube-master-addons.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/cluster/saltbase/salt/kube-master-addons/kube-master-addons.sh b/cluster/saltbase/salt/kube-master-addons/kube-master-addons.sh
deleted file mode 100755
index a4502bd65aa..00000000000
--- a/cluster/saltbase/salt/kube-master-addons/kube-master-addons.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014 The Kubernetes Authors.
-#
-# 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.
-
-# loadedImageFlags is a bit-flag to track which docker images loaded successfully.
-
-function load-docker-images() {
-  let loadedImageFlags=0
-  
-  while true; do
-    restart_docker=false
-  
-    if which docker 1>/dev/null 2>&1; then
-  
-      timeout 120 docker load -i /srv/salt/kube-bins/kube-apiserver.tar 1>/dev/null 2>&1
-      rc=$?
-      if [[ $rc == 0 ]]; then
-        let loadedImageFlags="$loadedImageFlags|1"
-      elif [[ $rc == 124 ]]; then
-        restart_docker=true
-      fi
-  
-      timeout 120 docker load -i /srv/salt/kube-bins/kube-scheduler.tar 1>/dev/null 2>&1
-      rc=$?
-      if [[ $rc == 0 ]]; then
-        let loadedImageFlags="$loadedImageFlags|2"
-      elif [[ $rc == 124 ]]; then
-        restart_docker=true
-      fi
-  
-      timeout 120 docker load -i /srv/salt/kube-bins/kube-controller-manager.tar 1>/dev/null 2>&1
-      rc=$?
-      if [[ $rc == 0 ]]; then
-        let loadedImageFlags="$loadedImageFlags|4"
-      elif [[ $rc == 124 ]]; then
-        restart_docker=true
-      fi
-    fi
-  
-    # required docker images got installed. exit while loop.
-    if [[ $loadedImageFlags == 7 ]]; then break; fi
-  
-    # Sometimes docker load hang, restart docker daemon resolve the issue
-    if [[ $restart_docker ]]; then
-      if ! service docker restart; then # Try systemctl if there's no service command.
-        systemctl restart docker      
-      fi
-    fi
-  
-    # sleep for 15 seconds before attempting to load docker images again
-    sleep 15
-  
-  done
-}
-
-function convert-rkt-image() {
-  (cd /tmp; ${DOCKER2ACI_BIN} $1)
-}
-
-function load-rkt-images() {
-  convert-rkt-image /srv/salt/kube-bins/kube-apiserver.tar
-  convert-rkt-image /srv/salt/kube-bins/kube-scheduler.tar
-  convert-rkt-image /srv/salt/kube-bins/kube-controller-manager.tar
-
-  # Currently, we can't run docker image tarballs directly,
-  # So we use 'rkt fetch' to load the docker images into rkt image stores.
-  # see https://github.com/coreos/rkt/issues/2392.
-  ${RKT_BIN} fetch /tmp/*.aci --insecure-options=image
-}
-
-if [[ "${KUBERNETES_CONTAINER_RUNTIME}" == "rkt" ]]; then
-  load-rkt-images
-else
-  load-docker-images
-fi
-
-# Now exit. After kube-push, salt will notice that the service is down and it
-# will start it and new docker images will be loaded.
diff --git a/cluster/saltbase/salt/kube-node-unpacker/init.sls b/cluster/saltbase/salt/kube-node-unpacker/init.sls
deleted file mode 100644
index 7c9d47eccc0..00000000000
--- a/cluster/saltbase/salt/kube-node-unpacker/init.sls
+++ /dev/null
@@ -1,67 +0,0 @@
-/etc/kubernetes/kube-node-unpacker.sh:
-  file.managed:
-    - source: salt://kube-node-unpacker/kube-node-unpacker.sh
-    - makedirs: True
-    - user: root
-    - group: root
-    - mode: 755
-
-{% if grains.cloud is defined and grains.cloud == 'gce' %}
-node-docker-image-tags:
-  file.touch:
-    - name: /srv/pillar/docker-images.sls
-{% else %}
-kube-proxy-tar:
-  file.managed:
-    - name: /srv/salt/kube-bins/kube-proxy.tar
-    - source: salt://kube-bins/kube-proxy.tar
-    - makedirs: True
-    - user: root
-    - group: root
-    - mode: 644
-{% endif %}
-
-{% set is_helium = '0' %}
-# Super annoying, the salt version on GCE is old enough that 'salt.cmd.run'
-# isn't supported
-# Salt Helium doesn't support systemd modules for service running
-{% if pillar.get('is_systemd') and is_helium == '0' %}
-
-{{ pillar.get('systemd_system_path') }}/kube-node-unpacker.service:
-  file.managed:
-    - source: salt://kube-node-unpacker/kube-node-unpacker.service
-    - user: root
-    - group: root
-  cmd.wait:
-    - name: /opt/kubernetes/helpers/services bounce kube-node-unpacker
-    - watch:
-{% if grains.cloud is defined and grains.cloud == 'gce' %}
-      - file: node-docker-image-tags
-{% else %}
-      - file: kube-proxy-tar
-{% endif %}
-      - file: /etc/kubernetes/kube-node-unpacker.sh
-      - file: {{ pillar.get('systemd_system_path') }}/kube-node-unpacker.service
-
-{% else %}
-
-/etc/init.d/kube-node-unpacker:
-  file.managed:
-    - source: salt://kube-node-unpacker/initd
-    - user: root
-    - group: root
-    - mode: 755
-
-kube-node-unpacker:
-  service.running:
-    - enable: True
-    - restart: True
-    - watch:
-{% if grains.cloud is defined and grains.cloud == 'gce' %}
-      - file: node-docker-image-tags
-{% else %}
-      - file: kube-proxy-tar
-{% endif %}
-      - file: /etc/kubernetes/kube-node-unpacker.sh
-
-{% endif %}
diff --git a/cluster/saltbase/salt/kube-node-unpacker/initd b/cluster/saltbase/salt/kube-node-unpacker/initd
deleted file mode 100755
index 13a61126414..00000000000
--- a/cluster/saltbase/salt/kube-node-unpacker/initd
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-#
-### BEGIN INIT INFO
-# Provides:   kube-node-unpacker
-# Required-Start:    $local_fs $network $syslog docker
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Kubernetes Node Unpacker
-# Description:
-#   Unpacks docker images on Kubernetes nodes
-### END INIT INFO
-
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Kubernetes Node Unpacker"
-NAME=kube-node-unpacker
-DAEMON_LOG_FILE=/var/log/$NAME.log
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-KUBE_MASTER_ADDONS_SH=/etc/kubernetes/kube-node-unpacker.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-
-
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-    ${KUBE_MASTER_ADDONS_SH} </dev/null >>${DAEMON_LOG_FILE} 2>&1 &
-    echo $! > ${PIDFILE}
-    disown
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-    kill $(cat ${PIDFILE})
-    rm ${PIDFILE}
-    return
-}
-
-case "$1" in
-  start)
-        log_daemon_msg "Starting $DESC" "$NAME"
-        do_start
-        case "$?" in
-                0|1) log_end_msg 0 || exit 0 ;;
-                2) log_end_msg 1 || exit 1 ;;
-        esac
-        ;;
-  stop)
-        log_daemon_msg "Stopping $DESC" "$NAME"
-        do_stop
-        case "$?" in
-                0|1) log_end_msg 0 ;;
-                2) exit 1 ;;
-        esac
-        ;;
-  status)
-        status_of_proc -p $PIDFILE $KUBE_MASTER_ADDONS_SH $NAME
-        ;;
-
-  restart|force-reload)
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        do_stop
-        case "$?" in
-          0|1)
-                do_start
-                case "$?" in
-                        0) log_end_msg 0 ;;
-                        1) log_end_msg 1 ;; # Old process is still running
-                        *) log_end_msg 1 ;; # Failed to start
-                esac
-                ;;
-          *)
-                # Failed to stop
-                log_end_msg 1
-                ;;
-        esac
-        ;;
-  *)
-        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-        exit 3
-        ;;
-esac
diff --git a/cluster/saltbase/salt/kube-node-unpacker/kube-node-unpacker.service b/cluster/saltbase/salt/kube-node-unpacker/kube-node-unpacker.service
deleted file mode 100644
index 4bbac62c3fd..00000000000
--- a/cluster/saltbase/salt/kube-node-unpacker/kube-node-unpacker.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kubernetes Node Unpacker
-Documentation=https://github.com/kubernetes/kubernetes
-
-[Service]
-ExecStart=/etc/kubernetes/kube-node-unpacker.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/cluster/saltbase/salt/kube-node-unpacker/kube-node-unpacker.sh b/cluster/saltbase/salt/kube-node-unpacker/kube-node-unpacker.sh
deleted file mode 100755
index d1124b61135..00000000000
--- a/cluster/saltbase/salt/kube-node-unpacker/kube-node-unpacker.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# 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.
-
-# loadedImageFlags is a bit-flag to track which docker images loaded successfully.
-let loadedImageFlags=0
-
-while true; do
-  restart_docker=false
-
-  if which docker 1>/dev/null 2>&1; then
-
-    timeout 120 docker load -i /srv/salt/kube-bins/kube-proxy.tar 1>/dev/null 2>&1
-    rc=$?
-    if [[ "${rc}" == 0 ]]; then
-      let loadedImageFlags="${loadedImageFlags}|1"
-    elif [[ "${rc}" == 124 ]]; then
-      restart_docker=true
-    fi
-  fi
-
-  # required docker images got installed. exit while loop.
-  if [[ "${loadedImageFlags}" == 1 ]]; then break; fi
-
-  # Sometimes docker load hang, restart docker daemon resolve the issue
-  if [[ "${restart_docker}" ]]; then service docker restart; fi
-
-  # sleep for 15 seconds before attempting to load docker images again
-  sleep 15
-
-done
-
-# Now exit. After kube-push, salt will notice that the service is down and it
-# will start it and new docker images will be loaded.
diff --git a/cluster/saltbase/salt/kube-proxy/OWNERS b/cluster/saltbase/salt/kube-proxy/OWNERS
deleted file mode 100644
index 08a30404890..00000000000
--- a/cluster/saltbase/salt/kube-proxy/OWNERS
+++ /dev/null
@@ -1,12 +0,0 @@
-approvers:
-- bowei
-- dnardo
-- freehan
-- nicksardo
-- mrhohn
-reviewers:
-- bowei
-- dnardo
-- freehan
-- nicksardo
-- mrhohn
diff --git a/cluster/saltbase/salt/kube-proxy/init.sls b/cluster/saltbase/salt/kube-proxy/init.sls
deleted file mode 100644
index 4ae6103dacd..00000000000
--- a/cluster/saltbase/salt/kube-proxy/init.sls
+++ /dev/null
@@ -1,40 +0,0 @@
-/var/lib/kube-proxy/kubeconfig:
-  file.managed:
-    - source: salt://kube-proxy/kubeconfig
-    - user: root
-    - group: root
-    - mode: 400
-    - makedirs: true
-
-# kube-proxy in a static pod
-{% if pillar.get('kube_proxy_daemonset', '').lower() != 'true' %}
-/etc/kubernetes/manifests/kube-proxy.manifest:
-  file.managed:
-    - source: salt://kube-proxy/kube-proxy.manifest
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - dir_mode: 755
-    - context:
-        # Increasing to 100m to avoid CPU starvation on full nodes.
-        # Any change here should be accompanied by a proportional change in CPU
-        # requests of other per-node add-ons (e.g. fluentd).
-        cpurequest: '100m'
-    - require:
-      - service: docker
-      - service: kubelet
-{% endif %}
-
-/var/log/kube-proxy.log:
-  file.managed:
-    - user: root
-    - group: root
-    - mode: 644
-
-#stop legacy kube-proxy service
-stop_kube-proxy:
-  service.dead:
-    - name: kube-proxy
-    - enable: None
diff --git a/cluster/saltbase/salt/kube-proxy/kubeconfig b/cluster/saltbase/salt/kube-proxy/kubeconfig
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/cluster/saltbase/salt/kube-registry-proxy/init.sls b/cluster/saltbase/salt/kube-registry-proxy/init.sls
deleted file mode 100644
index cc5d416a11d..00000000000
--- a/cluster/saltbase/salt/kube-registry-proxy/init.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-/etc/kubernetes/manifests/kube-registry-proxy.yaml:
-  file.managed:
-    - source: salt://kube-registry-proxy/kube-registry-proxy.yaml
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: True
-    - dir_mode: 755
diff --git a/cluster/saltbase/salt/kube-scheduler/init.sls b/cluster/saltbase/salt/kube-scheduler/init.sls
deleted file mode 100644
index 785d1316c32..00000000000
--- a/cluster/saltbase/salt/kube-scheduler/init.sls
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copy kube-scheduler manifest to manifests folder for kubelet.
-# The ordering of salt states for service docker, kubelet and
-# master-addon below is very important to avoid the race between
-# salt restart docker or kubelet and kubelet start master components.
-# Please see http://issue.k8s.io/10122#issuecomment-114566063
-# for detail explanation on this very issue.
-/etc/kubernetes/manifests/kube-scheduler.manifest:
-  file.managed:
-    - source: salt://kube-scheduler/kube-scheduler.manifest
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - dir_mode: 755
-    - require:
-      - service: docker
-      - service: kubelet
-
-/var/log/kube-scheduler.log:
-  file.managed:
-    - user: root
-    - group: root
-    - mode: 644
-
-#stop legacy kube-scheduler service 
-stop_kube-scheduler:
-  service.dead:
-    - name: kube-scheduler
-    - enable: None
diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
deleted file mode 100644
index c2aff4694a7..00000000000
--- a/cluster/saltbase/salt/kubelet/default
+++ /dev/null
@@ -1,192 +0,0 @@
-{% set daemon_args = "$DAEMON_ARGS" -%}
-{% if grains['os_family'] == 'RedHat' -%}
-  {% set daemon_args = "" -%}
-{% endif -%}
-
-
-# kubeconfig file
-{% set require_kubeconfig = "" %}
-{% if grains.kubelet_bootstrap_kubeconfig is defined -%}
-  {% set bootstrap_kubeconfig = "--bootstrap-kubeconfig=" + grains.kubelet_bootstrap_kubeconfig -%}
-{% else -%}
-  {% set bootstrap_kubeconfig = "" -%}
-{% endif -%}
-{% if grains.kubelet_kubeconfig is defined -%}
-  {% set kubeconfig = "--kubeconfig=" + grains.kubelet_kubeconfig -%}
-{% else -%}
-  {% set kubeconfig = "" -%}
-{% endif -%}
-
-{% set master_kubelet_args = "" %}
-
-{% set debugging_handlers = "--enable-debugging-handlers=true" -%}
-
-{% if grains['roles'][0] == 'kubernetes-master' -%}
-  {% if grains.cloud == 'gce' -%}
-    # Unless given a specific directive, disable registration for the kubelet
-    # running on the master.
-    {% if kubeconfig != "" -%}
-      {% set master_kubelet_args = master_kubelet_args + "--register-schedulable=false" -%}
-    {% endif -%}
-
-    # Disable the debugging handlers (/run and /exec) to prevent arbitrary
-    # code execution on the master.
-    # TODO(roberthbailey): Relax this constraint once the master is self-hosted.
-    {% set debugging_handlers = "--enable-debugging-handlers=false" -%}
-  {% endif -%}
-{% endif -%}
-
-{% set cloud_provider = "" -%}
-{% if grains.cloud is defined -%}
-  {% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
-{% endif -%}
-
-{% set cloud_config = "" -%}
-
-{% set config = "--pod-manifest-path=/etc/kubernetes/manifests" -%}
-
-{% set manifest_url = "" -%}
-{% set manifest_url_header = "" -%}
-{% if pillar.get('enable_manifest_url', '').lower() == 'true' %}
-  {% set manifest_url = "--manifest-url=" + pillar['manifest_url'] + " --manifest-url-header=" + pillar['manifest_url_header'] -%}
-{% endif -%}
-
-{% set hostname_override = "" -%}
-{% if grains.hostname_override is defined -%}
-  {% set hostname_override = " --hostname-override=" + grains.hostname_override -%}
-{% endif -%}
-
-{% set cluster_dns = "" %}
-{% set cluster_domain = "" %}
-{% if pillar.get('enable_cluster_dns', '').lower() == 'true' %}
-  {% set cluster_dns = "--cluster-dns=" + pillar['dns_server'] %}
-  {% set cluster_domain = "--cluster-domain=" + pillar['dns_domain'] %}
-{% endif %}
-
-{% set docker_root = "" -%}
-{% if grains.docker_root is defined -%}
-  {% set docker_root = " --docker-root=" + grains.docker_root -%}
-{% endif -%}
-
-{% set kubelet_root = "" -%}
-{% if grains.kubelet_root is defined -%}
-  {% set kubelet_root = " --root-dir=" + grains.kubelet_root -%}
-{% endif -%}
-
-{% set non_masquerade_cidr = "" -%}
-{% if pillar.get('non_masquerade_cidr','') -%}
-  {% set non_masquerade_cidr = "--non-masquerade-cidr=" + pillar.non_masquerade_cidr -%}
-{% endif -%}
-
-# Setup cgroups hierarchies.
-{% set cgroup_root = "" -%}
-{% set system_container = "" -%}
-{% set kubelet_container = "" -%}
-{% set runtime_container = "" -%}
-{% if grains['os_family'] == 'Debian' -%}
-  {% if pillar.get('is_systemd') %}
-    {% set cgroup_root = "--cgroup-root=docker" -%}
-  {% else %}
-    {% set cgroup_root = "--cgroup-root=/" -%}
-    {% set system_container = "--system-cgroups=/system" -%}
-    {% set runtime_container = "--runtime-cgroups=/docker-daemon" -%}
-    {% set kubelet_container= "--kubelet-cgroups=/kubelet" -%}
-  {% endif %}
-{% endif -%}
-{% if grains['oscodename'] in ['vivid','wily'] -%}
-  {% set cgroup_root = "--cgroup-root=docker" -%}
-{% endif -%}
-
-{% set pod_cidr = "" %}
-{% if grains['roles'][0] == 'kubernetes-master' %}
-  {% if grains.get('cbr-cidr') %}
-    {% set pod_cidr = "--pod-cidr=" + grains['cbr-cidr'] %}
-  {% elif kubeconfig == "" and pillar.get('network_provider', '').lower() == 'kubenet' %}
-    # Kubelet standalone mode needs a PodCIDR since there is no controller-manager
-    {% set pod_cidr = "--pod-cidr=10.76.0.0/16" %}
-  {% endif -%}
-{% endif %}
-
-{% set cpu_cfs_quota = "" %}
-{% if pillar['enable_cpu_cfs_quota'] is defined -%}
- {% set cpu_cfs_quota = "--cpu-cfs-quota=" + pillar['enable_cpu_cfs_quota'] -%}
-{% endif -%}
-
-{% set feature_gates = "" -%}
-{% if grains['feature_gates'] is defined -%}
-  {% set feature_gates = "--feature-gates=" + grains['feature_gates'] -%}
-{% endif %}
-
-{% set test_args = "" -%}
-{% if pillar['kubelet_test_args'] is defined -%}
-  {% set test_args=pillar['kubelet_test_args'] %}
-{% endif -%}
-
-{% set network_plugin = "" -%}
-{% if pillar.get('network_provider', '').lower() == 'opencontrail' %}
-  {% set network_plugin = "--network-plugin=opencontrail" %}
-{% elif pillar.get('network_provider', '').lower() == 'cni' %}
-  {% set network_plugin = "--network-plugin=cni --cni-conf-dir=/etc/cni/net.d/ --cni-bin-dir=/home/kubernetes/bin/" %}
-{% elif pillar.get('network_policy_provider', '').lower() == 'calico' and grains['roles'][0] != 'kubernetes-master' %}
-  {% set network_plugin = "--network-plugin=cni --cni-conf-dir=/etc/cni/net.d/ --cni-bin-dir=/home/kubernetes/bin/" %}
-{% elif pillar.get('network_provider', '').lower() == 'kubenet' %}
-  {% set network_plugin = "--network-plugin=kubenet --cni-bin-dir=/home/kubernetes/bin/" -%}
-{% endif -%}
-
-# Don't pipe the --hairpin-mode flag by default. This allows the kubelet to pick
-# an appropriate value.
-{% set hairpin_mode = "" -%}
-# The master cannot see Services because it doesn't run kube-proxy, so we don't
-# need to make its container bridge promiscuous. We also don't want to set
-# the hairpin-veth flag on the master because it increases the chances of
-# running into the kernel bug described in #20096.
-{% if grains['roles'][0] == 'kubernetes-master' -%}
-  {% set hairpin_mode = "--hairpin-mode=none" -%}
-{% elif pillar['hairpin_mode'] is defined and pillar['hairpin_mode'] in ['promiscuous-bridge', 'hairpin-veth', 'none'] -%}
-  {% set hairpin_mode = "--hairpin-mode=" + pillar['hairpin_mode'] -%}
-{% endif -%}
-
-{% set kubelet_port = "" -%}
-{% if pillar['kubelet_port'] is defined -%}
-  {% set kubelet_port="--port=" + pillar['kubelet_port'] %}
-{% endif -%}
-
-{% set log_level = pillar['log_level'] -%}
-{% if pillar['kubelet_test_log_level'] is defined -%}
-  {% set log_level = pillar['kubelet_test_log_level'] -%}
-{% endif -%}
-
-{% set enable_custom_metrics = "" -%}
-{% if pillar['enable_custom_metrics'] is defined -%}
-  {% set enable_custom_metrics="--enable-custom-metrics=" + pillar['enable_custom_metrics'] %}
-{% endif -%}
-
-{% set kube_proxy_ds_label = "" %}
-{% if grains['roles'][0] != 'kubernetes-master' and pillar.get('kube_proxy_daemonset', '').lower() == 'true' %}
-  # Add kube-proxy daemonset label to node to avoid situation during cluster
-  # upgrade/downgrade when there are two instances of kube-proxy running on a node.
-  {% set kube_proxy_ds_label = "beta.kubernetes.io/kube-proxy-ds-ready=true," %}
-{% endif %}
-{% set node_labels = kube_proxy_ds_label + pillar['node_labels'] %}
-{% if grains['roles'][0] != 'kubernetes-master' and pillar['non_master_node_labels'] is defined -%}
-  {% set node_labels = pillar['non_master_node_labels'] + "," + node_labels %}
-{% endif %}
-{% if node_labels != "" %}
-  {% set node_labels="--node-labels=" + node_labels %}
-{% endif %}
-
-{% set node_taints = "" %}
-{% if pillar['node_taints'] is defined -%}
-  {% set node_taints="--register-with-taints=" + pillar['node_taints'] %}
-{% endif -%}
-
-{% set eviction_hard = "" %}
-{% if pillar['eviction_hard'] is defined -%}
-  {% set eviction_hard="--eviction-hard=" + pillar['eviction_hard'] %}
-{% endif -%}
-
-{% set kubelet_auth = "--anonymous-auth=false --authorization-mode=Webhook --client-ca-file=" + pillar.get('ca_cert_bundle_path', '/var/lib/kubelet/ca.crt') %}
-{% set pki=" --cert-dir=/var/lib/kubelet/pki" -%}
-
-# test_args has to be kept at the end, so they'll overwrite any prior configuration
-DAEMON_ARGS="{{daemon_args}} {{bootstrap_kubeconfig}} {{kubeconfig}} {{require_kubeconfig}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{cloud_config}} {{config}} {{manifest_url}} --allow-privileged={{pillar['allow_privileged']}} {{log_level}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}}  {{non_masquerade_cidr}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{ master_kubelet_args }} {{cpu_cfs_quota}} {{network_plugin}} {{kubelet_port}} {{ hairpin_mode }} {{enable_custom_metrics}} {{runtime_container}} {{kubelet_container}} {{node_labels}} {{node_taints}} {{eviction_hard}} {{kubelet_auth}} {{pki}} {{feature_gates}} {{test_args}}"
diff --git a/cluster/saltbase/salt/kubelet/init.sls b/cluster/saltbase/salt/kubelet/init.sls
deleted file mode 100644
index ef6f926256a..00000000000
--- a/cluster/saltbase/salt/kubelet/init.sls
+++ /dev/null
@@ -1,106 +0,0 @@
-{% if pillar.get('is_systemd') %}
-{% set environment_file = '/etc/sysconfig/kubelet' %}
-{% else %}
-{% set environment_file = '/etc/default/kubelet' %}
-{% endif %}
-
-{{ environment_file}}:
-  file.managed:
-    - source: salt://kubelet/default
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-
-/usr/local/bin/kubelet:
-  file.managed:
-    - source: salt://kube-bins/kubelet
-    - user: root
-    - group: root
-    - mode: 755
-
-/var/lib/kubelet/pki:
-  file.directory:
-    - mode: 755
-    - makedirs: True
-
-# The default here is that this file is blank. If this is the case, the kubelet
-# won't be able to parse it as JSON and it will not be able to publish events
-# to the apiserver. You'll see a single error line in the kubelet start up file
-# about this.
-/var/lib/kubelet/bootstrap-kubeconfig:
-  file.managed:
-    - source: salt://kubelet/bootstrap-kubeconfig
-    - user: root
-    - group: root
-    - mode: 400
-    - makedirs: true
-
-{% if grains.cloud != 'gce' %}
-/var/lib/kubelet/ca.crt:
-  file.managed:
-    - source: salt://kubelet/ca.crt
-    - user: root
-    - group: root
-    - mode: 400
-    - makedirs: true
-{% endif %}
-
-{% if pillar.get('is_systemd') %}
-
-{{ pillar.get('systemd_system_path') }}/kubelet.service:
-  file.managed:
-    - source: salt://kubelet/kubelet.service
-    - user: root
-    - group: root
-
-# The service.running block below doesn't work reliably
-# Instead we run our script which e.g. does a systemd daemon-reload
-# But we keep the service block below, so it can be used by dependencies
-# TODO: Fix this
-fix-service-kubelet:
-  cmd.wait:
-    - name: /opt/kubernetes/helpers/services bounce kubelet
-    - watch:
-      - file: /var/lib/kubelet/pki
-      - file: /usr/local/bin/kubelet
-      - file: {{ pillar.get('systemd_system_path') }}/kubelet.service
-      - file: {{ environment_file }}
-      - file: /var/lib/kubelet/bootstrap-kubeconfig
-{% if grains.cloud != 'gce' %}
-      - file: /var/lib/kubelet/ca.crt
-{% endif %}
-
-{% else %}
-
-/etc/init.d/kubelet:
-  file.managed:
-    - source: salt://kubelet/initd
-    - user: root
-    - group: root
-    - mode: 755
-
-{% endif %}
-
-kubelet:
-  service.running:
-    - enable: True
-    - watch:
-      - file: /usr/local/bin/kubelet
-{% if pillar.get('is_systemd') %}
-      - file: {{ pillar.get('systemd_system_path') }}/kubelet.service
-{% else %}
-      - file: /etc/init.d/kubelet
-{% endif %}
-{% if grains['os_family'] == 'RedHat' %}
-      - file: /usr/lib/systemd/system/kubelet.service
-{% endif %}
-      - file: {{ environment_file }}
-      - file: /var/lib/kubelet/bootstrap-kubeconfig
-{% if grains.cloud != 'gce' %}
-      - file: /var/lib/kubelet/ca.crt
-{% endif %}
-{% if pillar.get('is_systemd') %}
-    - provider:
-      - service: systemd
-{%- endif %}
diff --git a/cluster/saltbase/salt/kubelet/initd b/cluster/saltbase/salt/kubelet/initd
deleted file mode 100644
index 5379c8e07d8..00000000000
--- a/cluster/saltbase/salt/kubelet/initd
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-#
-### BEGIN INIT INFO
-# Provides:   kubelet 
-# Required-Start:    $local_fs $network $syslog
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: The Kubernetes node container manager
-# Description:
-#   The Kubernetes container manager maintains docker state against a state file.
-### END INIT INFO
-
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="The Kubernetes container manager"
-NAME=kubelet
-DAEMON=/usr/local/bin/kubelet
-DAEMON_ARGS=""
-DAEMON_LOG_FILE=/var/log/$NAME.log
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-DAEMON_USER=root
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-        # Avoid a potential race at boot time when both monit and init.d start
-        # the same service
-        PIDS=$(pidof $DAEMON)
-        for PID in ${PIDS}; do
-            kill -9 $PID
-	done
-
-        # Return
-        #   0 if daemon has been started
-        #   1 if daemon was already running
-        #   2 if daemon could not be started
-        start-stop-daemon --start --quiet --background --no-close \
-                --make-pidfile --pidfile $PIDFILE \
-                --exec $DAEMON -c $DAEMON_USER --test > /dev/null \
-                || return 1
-        start-stop-daemon --start --quiet --background --no-close \
-                --make-pidfile --pidfile $PIDFILE \
-                --exec $DAEMON -c $DAEMON_USER -- \
-                $DAEMON_ARGS >> $DAEMON_LOG_FILE 2>&1 \
-                || return 2
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-        # Return
-        #   0 if daemon has been stopped
-        #   1 if daemon was already stopped
-        #   2 if daemon could not be stopped
-        #   other if a failure occurred
-        start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-        RETVAL="$?"
-        [ "$RETVAL" = 2 ] && return 2
-        # Many daemons don't delete their pidfiles when they exit.
-        rm -f $PIDFILE
-        return "$RETVAL"
-}
-
-
-case "$1" in
-  start)
-        log_daemon_msg "Starting $DESC" "$NAME"
-        do_start
-        case "$?" in
-                0|1) log_end_msg 0 || exit 0 ;;
-                2) log_end_msg 1 || exit 1 ;;
-        esac
-        ;;
-  stop)
-        log_daemon_msg "Stopping $DESC" "$NAME"
-        do_stop
-        case "$?" in
-                0|1) log_end_msg 0 ;;
-                2) exit 1 ;;
-        esac
-        ;;
-  status)
-        status_of_proc -p $PIDFILE "$DAEMON" "$NAME" && exit 0 || exit $?
-        ;;
-
-  restart|force-reload)
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        do_stop
-        case "$?" in
-          0|1)
-                do_start
-                case "$?" in
-                        0) log_end_msg 0 ;;
-                        1) log_end_msg 1 ;; # Old process is still running
-                        *) log_end_msg 1 ;; # Failed to start
-                esac
-                ;;
-          *)
-                # Failed to stop
-                log_end_msg 1
-                ;;
-        esac
-        ;;
-  *)
-        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-        exit 3
-        ;;
-esac
diff --git a/cluster/saltbase/salt/kubelet/kubeconfig b/cluster/saltbase/salt/kubelet/kubeconfig
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/cluster/saltbase/salt/kubelet/kubelet.service b/cluster/saltbase/salt/kubelet/kubelet.service
deleted file mode 100644
index c14a169a767..00000000000
--- a/cluster/saltbase/salt/kubelet/kubelet.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Kubernetes Kubelet Server
-Documentation=https://github.com/kubernetes/kubernetes
-
-[Service]
-EnvironmentFile=/etc/sysconfig/kubelet
-ExecStart=/usr/local/bin/kubelet "$DAEMON_ARGS"
-Restart=always
-RestartSec=2s
-StartLimitInterval=0
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
diff --git a/cluster/saltbase/salt/l7-gcp/OWNERS b/cluster/saltbase/salt/l7-gcp/OWNERS
deleted file mode 100644
index 59cd5f76e78..00000000000
--- a/cluster/saltbase/salt/l7-gcp/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-approvers:
-- bowei
-- nicksardo
-reviewers:
-- bowei
-- nicksardo
diff --git a/cluster/saltbase/salt/l7-gcp/init.sls b/cluster/saltbase/salt/l7-gcp/init.sls
deleted file mode 100644
index 6617d6bf8d4..00000000000
--- a/cluster/saltbase/salt/l7-gcp/init.sls
+++ /dev/null
@@ -1,17 +0,0 @@
-/etc/kubernetes/manifests/glbc.manifest:
-  file.managed:
-    - source: salt://l7-gcp/glbc.manifest
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - dir_mode: 755
-
-/var/log/glbc.log:
-  file.managed:
-    - user: root
-    - group: root
-    - mode: 644
-
-
diff --git a/cluster/saltbase/salt/logrotate/conf b/cluster/saltbase/salt/logrotate/conf
deleted file mode 100644
index 0f6fc19579f..00000000000
--- a/cluster/saltbase/salt/logrotate/conf
+++ /dev/null
@@ -1,13 +0,0 @@
-/var/log/{{ file }}.log {
-    rotate 5
-    copytruncate
-    missingok
-    notifempty
-    compress
-    maxsize 100M
-    daily
-    dateext
-    dateformat -%Y%m%d-%s
-    create 0644 root root
-}
-
diff --git a/cluster/saltbase/salt/logrotate/cron b/cluster/saltbase/salt/logrotate/cron
deleted file mode 100755
index f8a2a3d33d2..00000000000
--- a/cluster/saltbase/salt/logrotate/cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-logrotate /etc/logrotate.conf
diff --git a/cluster/saltbase/salt/logrotate/docker-containers b/cluster/saltbase/salt/logrotate/docker-containers
deleted file mode 100644
index 8809851cd51..00000000000
--- a/cluster/saltbase/salt/logrotate/docker-containers
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/lib/docker/containers/*/*-json.log {
-    rotate 5
-    copytruncate
-    missingok
-    notifempty
-    compress
-    maxsize 10M
-    daily
-    create 0644 root root
-}
diff --git a/cluster/saltbase/salt/logrotate/init.sls b/cluster/saltbase/salt/logrotate/init.sls
deleted file mode 100644
index 6a3a9e1e0aa..00000000000
--- a/cluster/saltbase/salt/logrotate/init.sls
+++ /dev/null
@@ -1,35 +0,0 @@
-logrotate:
-  pkg:
-    - installed
-
-{% set logrotate_files = ['kube-scheduler', 'kube-proxy', 'kubelet', 'kube-apiserver', 'kube-apiserver-audit', 'kube-controller-manager', 'kube-addons', 'docker'] %}
-{% for file in logrotate_files %}
-/etc/logrotate.d/{{ file }}:
-  file:
-    - managed
-    - source: salt://logrotate/conf
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - context:
-      file: {{ file }}
-{% endfor %}
-
-/etc/logrotate.d/docker-containers:
-  file:
-    - managed
-    - source: salt://logrotate/docker-containers
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-
-/etc/cron.hourly/logrotate:
-  file:
-    - managed
-    - source: salt://logrotate/cron
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 755
diff --git a/cluster/saltbase/salt/ntp/init.sls b/cluster/saltbase/salt/ntp/init.sls
deleted file mode 100644
index fa8c8a7c461..00000000000
--- a/cluster/saltbase/salt/ntp/init.sls
+++ /dev/null
@@ -1,11 +0,0 @@
-ntp:
-  pkg:
-    - installed
-
-ntp-service:
-  service:
-    - running
-    - name: ntp
-    - watch:
-      - pkg: ntp
-
diff --git a/cluster/saltbase/salt/opencontrail-networking-master/init.sls b/cluster/saltbase/salt/opencontrail-networking-master/init.sls
deleted file mode 100644
index 78290bb2bb7..00000000000
--- a/cluster/saltbase/salt/opencontrail-networking-master/init.sls
+++ /dev/null
@@ -1,15 +0,0 @@
-opencontrail-networking-master:
-  cmd.script:
-    - unless: test -f /var/log/contrail/provision_master.log
-    - env:
-      - 'OPENCONTRAIL_TAG': '{{ pillar.get('opencontrail_tag') }}'
-      - 'OPENCONTRAIL_KUBERNETES_TAG': '{{ pillar.get('opencontrail_kubernetes_tag') }}'
-      - 'OPENCONTRAIL_PUBLIC_SUBNET': '{{ pillar.get('opencontrail_public_subnet') }}'
-      - 'SERVICE_CLUSTER_IP_RANGE': '{{ pillar.get('service_cluster_ip_range') }}'
-    - source: https://raw.githubusercontent.com/juniper/contrail-kubernetes/{{ pillar.get('opencontrail_kubernetes_tag') }}/cluster/provision_master.sh
-    - source_hash: https://raw.githubusercontent.com/juniper/contrail-kubernetes/{{ pillar.get('opencontrail_kubernetes_tag') }}/cluster/manifests.hash
-    - cwd: /
-    - user: root
-    - group: root
-    - mode: 755
-    - shell: /bin/bash
diff --git a/cluster/saltbase/salt/opencontrail-networking-minion/init.sls b/cluster/saltbase/salt/opencontrail-networking-minion/init.sls
deleted file mode 100644
index 7cb68de860c..00000000000
--- a/cluster/saltbase/salt/opencontrail-networking-minion/init.sls
+++ /dev/null
@@ -1,15 +0,0 @@
-opencontrail-networking-minion:
-  cmd.script:
-    - unless: test -f /var/log/contrail/provision_minion.log
-    - env:
-      - 'OPENCONTRAIL_TAG': '{{ pillar.get('opencontrail_tag') }}'
-      - 'OPENCONTRAIL_KUBERNETES_TAG': '{{ pillar.get('opencontrail_kubernetes_tag') }}'
-      - 'OPENCONTRAIL_PUBLIC_SUBNET': '{{ pillar.get('opencontrail_public_subnet') }}'
-      - 'SERVICE_CLUSTER_IP_RANGE': '{{ pillar.get('service_cluster_ip_range') }}'
-    - source: https://raw.githubusercontent.com/juniper/contrail-kubernetes/{{ pillar.get('opencontrail_kubernetes_tag') }}/cluster/provision_minion.sh
-    - source_hash: https://raw.githubusercontent.com/juniper/contrail-kubernetes/{{ pillar.get('opencontrail_kubernetes_tag') }}/cluster/manifests.hash
-    - cwd: /
-    - user: root
-    - group: root
-    - mode: 755
-    - shell: /bin/bash
diff --git a/cluster/saltbase/salt/rescheduler/init.sls b/cluster/saltbase/salt/rescheduler/init.sls
deleted file mode 100644
index a32d0855758..00000000000
--- a/cluster/saltbase/salt/rescheduler/init.sls
+++ /dev/null
@@ -1,15 +0,0 @@
-/etc/kubernetes/manifests/rescheduler.manifest:
-  file.managed:
-    - source: salt://rescheduler/rescheduler.manifest
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: true
-    - dir_mode: 755
-
-/var/log/rescheduler.log:
-  file.managed:
-    - user: root
-    - group: root
-    - mode: 644
diff --git a/cluster/saltbase/salt/salt-helpers/init.sls b/cluster/saltbase/salt/salt-helpers/init.sls
deleted file mode 100644
index 389800130a3..00000000000
--- a/cluster/saltbase/salt/salt-helpers/init.sls
+++ /dev/null
@@ -1,24 +0,0 @@
-/opt/kubernetes/helpers:
-  file.directory:
-    - user: root
-    - group: root
-    - makedirs: True
-    - dir_mode: 755
-
-{% if pillar.get('is_systemd') %}
-/opt/kubernetes/helpers/services:
-  file.managed:
-    - source: salt://salt-helpers/services
-    - user: root
-    - group: root
-    - mode: 755
-{% endif %}
-
-{% if grains.get('os_family', '') == 'Debian' -%}
-/opt/kubernetes/helpers/pkg:
-  file.managed:
-    - source: salt://salt-helpers/pkg-apt
-    - user: root
-    - group: root
-    - mode: 755
-{% endif %}
diff --git a/cluster/saltbase/salt/salt-helpers/pkg-apt b/cluster/saltbase/salt/salt-helpers/pkg-apt
deleted file mode 100644
index 2bb3ea666e4..00000000000
--- a/cluster/saltbase/salt/salt-helpers/pkg-apt
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-# Copyright 2016 The Kubernetes Authors.
-#
-# 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.
-
-# Helper script that installs a package, wrapping it with a policy that
-# means we won't try to start services.
-set -o errexit
-set -o nounset
-set -o pipefail
-
-ACTION=${1}
-NAME=${2}
-VERSION=${3}
-SRC=${4}
-
-if [[ -z "${ACTION}" || -z "${NAME}" || -z "${VERSION}" || -z "${SRC}" ]]; then
-  echo "Syntax: ${0} <action> <name> <version> <src>"
-  exit 1
-fi
-
-old_policy=""
-
-function install_no_start {
-  # Query the existing installed version, assuming that an error means package not found
-  existing=`dpkg-query -W -f='${Version}' ${NAME} 2>/dev/null || echo ""`
-  if [[ -n "${existing}" ]]; then
-    if [[ "${existing}" == "${VERSION}" ]]; then
-      return
-    fi
-    echo "Different version of package ${NAME} installed: ${VERSION} vs ${existing}"
-  fi
-
-  if [[ -e "/usr/sbin/policy-rc.d" ]]; then
-    tmpfile=`mktemp`
-    mv /usr/sbin/policy-rc.d ${tmpfile}
-    old_policy=${tmpfile}
-  fi
-  trap cleanup EXIT
-  echo -e '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d
-  chmod 755 /usr/sbin/policy-rc.d
-
-  echo "Installing package ${NAME} from ${SRC}"
-  dpkg --install ${SRC}
-}
-
-function cleanup {
-  rm -f /usr/sbin/policy-rc.d
-  if [[ -n "${old_policy}" ]]; then
-    mv ${old_policy} /usr/sbin/policy-rc.d
-  fi
-}
-
-if [[ "${ACTION}" == "install-no-start" ]]; then
-  install_no_start
-else
-  echo "Unknown action: ${ACTION}"
-  exit 1
-fi
diff --git a/cluster/saltbase/salt/salt-helpers/services b/cluster/saltbase/salt/salt-helpers/services
deleted file mode 100644
index c935f673c5d..00000000000
--- a/cluster/saltbase/salt/salt-helpers/services
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# 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.
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-ACTION=${1}
-SERVICE=${2}
-
-if [[ -z "${ACTION}" || -z "${SERVICE}" ]]; then
-  echo "Syntax: ${0} <action> <service>"
-  exit 1
-fi
-
-
-function reload_state() {
-  systemctl daemon-reload
-}
-
-function start_service() {
-  systemctl start ${SERVICE}
-}
-
-function stop_service() {
-  systemctl stop ${SERVICE}
-}
-
-function enable_service() {
-  systemctl enable ${SERVICE}
-}
-
-function disable_service() {
-  systemctl disable ${SERVICE}
-}
-
-function restart_service() {
-  systemctl restart ${SERVICE}
-}
-
-if [[ "${ACTION}" == "up" ]]; then
-  reload_state
-  enable_service
-  start_service
-elif [[ "${ACTION}" == "bounce" ]]; then
-  reload_state
-  enable_service
-  restart_service
-elif [[ "${ACTION}" == "down" ]]; then
-  reload_state
-  disable_service
-  stop_service
-elif [[ "${ACTION}" == "enable" ]]; then
-  reload_state
-  enable_service
-else
-  echo "Unknown action: ${ACTION}"
-  exit 1
-fi
diff --git a/cluster/saltbase/salt/supervisor/docker-checker.sh b/cluster/saltbase/salt/supervisor/docker-checker.sh
deleted file mode 100755
index 4d3992d53b2..00000000000
--- a/cluster/saltbase/salt/supervisor/docker-checker.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# 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 script is intended to start the docker and then loop until
-# it detects a failure.  It then exits, and supervisord restarts it
-# which in turn restarts docker.
-
-main() {
-  if ! healthy 60; then
-    stop_docker
-    start_docker
-    echo "waiting 30s for startup"
-    sleep 30
-    healthy 60
-  fi
-
-  while healthy; do
-    sleep 10
-  done
-
-  echo "Docker failed!"
-  exit 2
-}
-
-# Performs health check on docker.  If a parameter is passed, it is treated as
-# the number of seconds to keep trying for a healthy result.  If none is passed
-# we make only one attempt.
-healthy() {
-  max_retry_sec="$1"
-  shift
-
-  starttime=$(date +%s)
-  while ! timeout 60 docker ps > /dev/null; do
-    if [[ -z "$max_retry_sec" || $(( $(date +%s) - starttime )) -gt "$max_retry_sec" ]]; then
-      echo "docker ps did not succeed"
-      return 2
-    else
-      echo "waiting 5s before retry"
-      sleep 5
-    fi
-  done
-  echo "docker is healthy"
-  return 0
-}
-
-stop_docker() {
-  /etc/init.d/docker stop
-  # Make sure docker gracefully terminated before start again
-  starttime=`date +%s`
-  while pidof docker > /dev/null; do
-      currenttime=`date +%s`
-      ((elapsedtime = currenttime - starttime))
-      # after 60 seconds, forcefully terminate docker process
-      if test $elapsedtime -gt 60; then
-        echo "attempting to kill docker process with sigkill signal"
-        kill -9 `pidof docker` || sleep 10
-      else
-        echo "waiting clean shutdown"
-        sleep 10
-      fi
-  done
-}
-
-start_docker() {
-  echo "docker is not running. starting docker"
-
-  # cleanup docker network checkpoint to avoid running into known issue
-  # of docker (https://github.com/docker/docker/issues/18283)
-  rm -rf /var/lib/docker/network
-
-  /etc/init.d/docker start
-}
-
-main
diff --git a/cluster/saltbase/salt/supervisor/docker.conf b/cluster/saltbase/salt/supervisor/docker.conf
deleted file mode 100644
index 3fd61f3f973..00000000000
--- a/cluster/saltbase/salt/supervisor/docker.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[program:docker]
-command=/usr/sbin/docker-checker.sh
-stderr_logfile=/var/log/supervisor/docker-stderr.log
-stdout_logfile=/var/log/supervisor/docker-stdout.log
-autorestart=true
-startretries=1000000
diff --git a/cluster/saltbase/salt/supervisor/init.sls b/cluster/saltbase/salt/supervisor/init.sls
deleted file mode 100644
index fb2b387a964..00000000000
--- a/cluster/saltbase/salt/supervisor/init.sls
+++ /dev/null
@@ -1,102 +0,0 @@
-{% if not pillar.get('is_systemd') %}
-
-supervisor:
-  pkg:
-    - installed
-
-monit:
-  pkg:
-    - purged
-
-/etc/supervisor/conf.d/docker.conf:
-  file:
-    - managed
-    - source: salt://supervisor/docker.conf
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: True
-    - require_in:
-      - pkg: supervisor
-    - require:
-      - file: /usr/sbin/docker-checker.sh
-
-/usr/sbin/docker-checker.sh:
-  file:
-    - managed
-    - source: salt://supervisor/docker-checker.sh
-    - user: root
-    - group: root
-    - mode: 755
-    - makedirs: True
-
-/etc/supervisor/conf.d/kubelet.conf:
-  file:
-    - managed
-    - source: salt://supervisor/kubelet.conf
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: True
-    - require_in: 
-      - pkg: supervisor
-    - require: 
-      - file: /usr/sbin/kubelet-checker.sh
-
-/usr/sbin/kubelet-checker.sh:
-  file:
-    - managed
-    - source: salt://supervisor/kubelet-checker.sh
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 755
-    - makedirs: True
-
-{% if grains['roles'][0] == 'kubernetes-master' -%}
-/etc/supervisor/conf.d/kube-addons.conf:
-  file:
-    - managed
-    - source: salt://supervisor/kube-addons.conf
-    - user: root
-    - group: root
-    - mode: 644
-    - makedirs: True
-    - require_in: 
-      - pkg: supervisor
-    - require: 
-      - file: /usr/sbin/kube-addons-checker.sh
-
-/usr/sbin/kube-addons-checker.sh:
-  file:
-    - managed
-    - source: salt://supervisor/kube-addons-checker.sh
-    - user: root
-    - group: root
-    - mode: 755
-    - makedirs: True
-{% endif %}
-
-/etc/supervisor/supervisor_watcher.sh:
-  file.managed:
-    - source: salt://supervisor/supervisor_watcher.sh
-    - user: root
-    - group: root
-    - mode: 755
-    - makedirs: True
-
-crontab -l | { cat; echo "* * * * * /etc/supervisor/supervisor_watcher.sh 2>&1 | logger"; } | crontab -:
-  cmd.run:
-  - unless: crontab -l | grep "* * * * * /etc/supervisor/supervisor_watcher.sh 2>&1 | logger"
-
-supervisor-service:
-  service:
-    - running
-    - name: supervisor
-    - watch:
-      - pkg: supervisor
-      - file: /etc/supervisor/conf.d/*
-    - require:
-      - pkg: supervisor
-
-{% endif %}
diff --git a/cluster/saltbase/salt/supervisor/kube-addons-checker.sh b/cluster/saltbase/salt/supervisor/kube-addons-checker.sh
deleted file mode 100644
index 3bd664f155a..00000000000
--- a/cluster/saltbase/salt/supervisor/kube-addons-checker.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# 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 script is intended to start the kube-addons and then loop until
-# it detects a failure.  It then exits, and supervisord restarts it
-# which in turn restarts the kube-addons.
-
-/etc/init.d/kube-addons stop
-/etc/init.d/kube-addons start
-
-echo "waiting a minute for startup"
-sleep 60
-
-while true; do
-  if ! /etc/init.d/kube-addons status > /dev/null; then
-    echo "kube-addons failed!"
-    exit 2
-  fi
-  sleep 10
-done
-
diff --git a/cluster/saltbase/salt/supervisor/kube-addons.conf b/cluster/saltbase/salt/supervisor/kube-addons.conf
deleted file mode 100644
index db977aed123..00000000000
--- a/cluster/saltbase/salt/supervisor/kube-addons.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[program:kube-addons]
-command=/usr/sbin/kube-addons-checker.sh
-stderr_logfile=/var/log/supervisor/kube-addons-stderr.log
-stdout_logfile=/var/log/supervisor/kube-addons-stdout.log
-autorestart=true
-startretries=1000000
diff --git a/cluster/saltbase/salt/supervisor/kubelet-checker.sh b/cluster/saltbase/salt/supervisor/kubelet-checker.sh
deleted file mode 100755
index 85b67f66d3b..00000000000
--- a/cluster/saltbase/salt/supervisor/kubelet-checker.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# 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 script is intended to start the kubelet and then loop until
-# it detects a failure.  It then exits, and supervisord restarts it
-# which in turn restarts the kubelet.
-
-/etc/init.d/kubelet stop
-/etc/init.d/kubelet start
-
-echo "waiting a minute for startup"
-sleep 60
-
-max_seconds=10
-
-while true; do
-if ! curl -m ${max_seconds} -f -s http://127.0.0.1:10255/healthz > /dev/null; then
-    echo "kubelet failed!"
-    curl http://127.0.0.1:10255/healthz
-    exit 2
-  fi
-  sleep 10
-done
-
diff --git a/cluster/saltbase/salt/supervisor/kubelet.conf b/cluster/saltbase/salt/supervisor/kubelet.conf
deleted file mode 100644
index 25f8274d375..00000000000
--- a/cluster/saltbase/salt/supervisor/kubelet.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[program:kubelet]
-command=/usr/sbin/kubelet-checker.sh
-stderr_logfile=/var/log/supervisor/kubelet-stderr.log
-stdout_logfile=/var/log/supervisor/kubelet-stdout.log
-autorestart=true
-startretries=1000000
diff --git a/cluster/saltbase/salt/supervisor/supervisor_watcher.sh b/cluster/saltbase/salt/supervisor/supervisor_watcher.sh
deleted file mode 100644
index acc0f9e05bf..00000000000
--- a/cluster/saltbase/salt/supervisor/supervisor_watcher.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# 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 script is invoked by crond every minute to check if supervisord is
-# up and oom protected. If down it restarts supervisord; otherwise, it exits
-# after applying oom_score_adj
-
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-if ! /etc/init.d/supervisor status > /dev/null; then
-    service supervisor start
-    sleep 10
-fi
-
-# Apply oom_score_adj: -901 to processes
-pids=$(cat /var/run/supervisord.pid)
-for pid in "${pids}"; do
-    echo -901 > /proc/$pid/oom_score_adj
-done
-
-
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
deleted file mode 100644
index 51c3a347cca..00000000000
--- a/cluster/saltbase/salt/top.sls
+++ /dev/null
@@ -1,73 +0,0 @@
-base:
-  '*':
-    - base
-    - debian-auto-upgrades
-    - salt-helpers
-{% if pillar.get('e2e_storage_test_environment', '').lower() == 'true' %}
-    - e2e
-{% endif %}
-
-  'roles:kubernetes-pool':
-    - match: grain
-    - docker
-{% if pillar.get('network_policy_provider', '').lower() == 'calico' %}
-    - cni
-{% elif pillar.get('network_provider', '').lower() == 'kubenet' %}
-    - cni
-{% elif pillar.get('network_provider', '').lower() == 'cni' %}
-    - cni
-{% endif %}
-    - kube-client-tools
-    - kube-node-unpacker
-    - kubelet
-{% if pillar.get('network_provider', '').lower() == 'opencontrail' %}
-    - opencontrail-networking-minion
-{% else %}
-    - kube-proxy
-{% endif %}
-{% if pillar.get('enable_cluster_registry', '').lower() == 'true' %}
-    - kube-registry-proxy
-{% endif %}
-{% if pillar['prepull_e2e_images'] is defined and pillar['prepull_e2e_images'].lower() == 'true' %}
-    - e2e-image-puller
-{% endif %}
-    - logrotate
-    - supervisor
-{% if pillar.get('network_policy_provider', '').lower() == 'calico' %}
-    - calico.node
-{% endif %}
-
-  'roles:kubernetes-master':
-    - match: grain
-    - generate-cert
-    - etcd
-{% if pillar.get('network_provider', '').lower() == 'kubenet' %}
-    - cni
-{% elif pillar.get('network_provider', '').lower() == 'cni' %}
-    - cni
-{% endif %}
-{% if pillar.get('enable_l7_loadbalancing', '').lower() == 'glbc' %}
-    - l7-gcp
-{% endif %}
-    - kube-apiserver
-    - kube-controller-manager
-    - kube-scheduler
-    - supervisor
-    - kube-client-tools
-    - kube-master-addons
-    - kube-admission-controls
-    - logrotate
-    - kube-addons
-{% if grains['cloud'] is defined and grains['cloud'] == 'gce' %}
-    - docker
-    - kubelet
-{% endif %}
-{% if pillar.get('network_provider', '').lower() == 'opencontrail' %}
-    - opencontrail-networking-master
-{% endif %}
-{% if pillar.get('enable_cluster_autoscaler', '').lower() == 'true' %}
-    - cluster-autoscaler
-{% endif %}
-{% if pillar.get('enable_rescheduler', '').lower() == 'true' %}
-    - rescheduler
-{% endif %}