mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-15 14:14:39 +00:00
gce: allow extra addons to be sourced form a url
This commit is contained in:
@@ -1954,6 +1954,33 @@ function setup-addon-manifests {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# A function that downloads extra addons from a URL and puts them in the GCI
|
||||||
|
# manifests directory.
|
||||||
|
function download-extra-addons {
|
||||||
|
local -r out_dir="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty/gce-extras"
|
||||||
|
|
||||||
|
mkdir -p "${out_dir}"
|
||||||
|
|
||||||
|
local curl_cmd=(
|
||||||
|
"curl"
|
||||||
|
"--fail"
|
||||||
|
"--retry" "5"
|
||||||
|
"--retry-delay" "3"
|
||||||
|
"--silent"
|
||||||
|
"--show-error"
|
||||||
|
)
|
||||||
|
if [[ -n "${CURL_RETRY_CONNREFUSED:-}" ]]; then
|
||||||
|
curl_cmd+=("${CURL_RETRY_CONNREFUSED}")
|
||||||
|
fi
|
||||||
|
if [[ -n "${EXTRA_ADDONS_HEADER:-}" ]]; then
|
||||||
|
curl_cmd+=("-H" "${EXTRA_ADDONS_HEADER}")
|
||||||
|
fi
|
||||||
|
curl_cmd+=("-o" "${out_dir}/extras.json")
|
||||||
|
curl_cmd+=("${EXTRA_ADDONS_URL}")
|
||||||
|
|
||||||
|
"${curl_cmd[@]}"
|
||||||
|
}
|
||||||
|
|
||||||
# A helper function for copying manifests and setting dir/files
|
# A helper function for copying manifests and setting dir/files
|
||||||
# permissions.
|
# permissions.
|
||||||
#
|
#
|
||||||
@@ -2245,6 +2272,10 @@ EOF
|
|||||||
setup-addon-manifests "addons" "istio/noauth"
|
setup-addon-manifests "addons" "istio/noauth"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
if [[ -n "${EXTRA_ADDONS_URL:-}" ]]; then
|
||||||
|
download-extra-addons
|
||||||
|
setup-addon-manifests "addons" "gce-extras"
|
||||||
|
fi
|
||||||
|
|
||||||
# Place addon manager pod manifest.
|
# Place addon manager pod manifest.
|
||||||
cp "${src_dir}/kube-addon-manager.yaml" /etc/kubernetes/manifests
|
cp "${src_dir}/kube-addon-manager.yaml" /etc/kubernetes/manifests
|
||||||
|
Reference in New Issue
Block a user