From 13116457ba6ed28f1d72061aa52c99d53fe95040 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Sat, 13 Jan 2018 08:24:17 -0800 Subject: [PATCH] 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 | 20 ++------- 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, 45 insertions(+), 81 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 9b820b1bbd37f..1fd9296fd016a 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 9d3ad2c97443f..8dea73c4cd20c 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"], + name = "manifests", + mode = "0644", + package_dir = "kubernetes/gci-trusty", deps = [ "//cluster/addons", + "//cluster/gce:gce-master-manifests", "//cluster/gce:gci-trusty-manifests", "//cluster/gce/addons", - "//cluster/saltbase:gci-trusty-salt-manifests", - ], -) - -pkg_tar( - name = "manifests", - mode = "0644", - package_dir = "kubernetes", - deps = [ - ":_manifests-gci-trusty", - "//cluster/saltbase:salt-manifests", ], ) diff --git a/cluster/gce/BUILD b/cluster/gce/BUILD index e297c36ef6f75..9f0717fe71dcc 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 5d22636a5b5ee..53aaa48fd5299 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 13723fb63e33c..484ca06ca607f 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", - ], -)