Skip to content

K
k3s
Commit e4a38754 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #22616 from andyzheng0831/trusty-release

Auto commit by PR queue bot
parents 89c9c249 0df50b70
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
cluster/gce/trusty/configure.sh
View file @ e4a38754
...@@ -223,6 +223,13 @@ install_kube_binary_config() { ...@@ -223,6 +223,13 @@ install_kube_binary_config() {
echo "Validated ${KUBE_MANIFESTS_TAR_URL} SHA1 = ${KUBE_MANIFESTS_TAR_HASH}" echo "Validated ${KUBE_MANIFESTS_TAR_URL} SHA1 = ${KUBE_MANIFESTS_TAR_HASH}"
fi fi
tar xzf "/run/kube-manifests/${manifests_tar}" -C /run/kube-manifests/ --overwrite tar xzf "/run/kube-manifests/${manifests_tar}" -C /run/kube-manifests/ --overwrite
readonly kube_addon_registry="${KUBE_ADDON_REGISTRY:-gcr.io/google_containers}"
if [ "${kube_addon_registry}" != "gcr.io/google_containers" ]; then
find /run/kube-manifests -name \*.yaml -or -name \*.yaml.in | \
xargs sed -ri "s@(image:\s.*)gcr.io/google_containers@\1${kube_addon_registry}@"
find /run/kube-manifests -name \*.manifest -or -name \*.json | \
xargs sed -ri "s@(image\":\s+\")gcr.io/google_containers@\1${kube_addon_registry}@"
fi
rm "/run/kube-manifests/${manifests_sha1}" rm "/run/kube-manifests/${manifests_sha1}"
rm "/run/kube-manifests/${manifests_tar}" rm "/run/kube-manifests/${manifests_tar}"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment