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

@@ -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

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",
     ],
 )
 

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",
+)

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.

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",
-    ],
-)