From 5cd3c01bc5611030b6d02900af6abaf1a9bb8cac Mon Sep 17 00:00:00 2001 From: Daniel Wang Date: Thu, 26 May 2016 09:01:43 -0700 Subject: [PATCH] GCI: Fix yaml search path --- cluster/gce/gci/configure.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index 5cf02455b51..dd1a010a7b0 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -165,9 +165,9 @@ function install-kube-binary-config { tar xzf "${KUBE_HOME}/${manifests_tar}" -C "${dst_dir}" --overwrite local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-gcr.io/google_containers}" if [[ "${kube_addon_registry}" != "gcr.io/google_containers" ]]; then - find "${dst_dir}" -maxdepth 1 -name \*.yaml -or -name \*.yaml.in | \ + find "${dst_dir}/kubernetes" -maxdepth 1 -name \*.yaml -or -name \*.yaml.in | \ xargs sed -ri "s@(image:\s.*)gcr.io/google_containers@\1${kube_addon_registry}@" - find "${dst_dir}" -maxdepth 1 -name \*.manifest -or -name \*.json | \ + find "${dst_dir}/kubernetes" -maxdepth 1 -name \*.manifest -or -name \*.json | \ xargs sed -ri "s@(image\":\s+\")gcr.io/google_containers@\1${kube_addon_registry}@" fi cp "${dst_dir}/kubernetes/gci-trusty/gci-configure-helper.sh" "${KUBE_HOME}/bin/configure-helper.sh"