github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108429 from dims/allow-env-var-to-be-remote-url

Browse Source 
Allow KUBE_TEST_REPO_LIST to be a remote url as well
This commit is contained in:
Kubernetes Prow Robot
2022-03-02 08:07:16 -08:00
committed by GitHub
parent 88f9728339 08af9935a5
commit 4737127b57
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/gci/configure.sh
View File

@@ -427,9 +427,9 @@ function install-kube-manifests {
tar xzf "${KUBE_HOME}/${manifests_tar}" -C "${dst_dir}" --overwrite
local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-k8s.gcr.io}"
if [[ "${kube_addon_registry}" != "k8s.gcr.io" ]]; then
find "${dst_dir}" \(-name '*.yaml' -or -name '*.yaml.in'\) -print0 | \
find "${dst_dir}" \( -name '*.yaml' -or -name '*.yaml.in' \) -print0 | \
xargs -0 sed -ri "s@(image:\s.*)k8s.gcr.io@\1${kube_addon_registry}@"
find "${dst_dir}" \(-name '*.manifest' -or -name '*.json'\) -print0 | \
find "${dst_dir}" \( -name '*.manifest' -or -name '*.json' \) -print0 | \
xargs -0 sed -ri "s@(image\":\s+\")k8s.gcr.io@\1${kube_addon_registry}@"
fi
cp "${dst_dir}/kubernetes/gci-trusty/gci-configure-helper.sh" "${KUBE_BIN}/configure-helper.sh"