github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

gke: fix failing e2e tests

Browse Source
This commit is contained in:
Mike Danese 2018-09-04 20:23:48 -07:00
parent be11540775
commit ad0208d720
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2029,7 +2029,7 @@ function setup-addon-manifests {
copy-manifests "${psp_dir}" "${dst_dir}" copy-manifests "${psp_dir}" "${dst_dir}"
fi fi
fi fi
if [[ "${ENABLE_NODE_TERMINATION_HANDLER}" == "true" ]]; then if [[ "${ENABLE_NODE_TERMINATION_HANDLER:-}" == "true" ]]; then
local -r nth_dir="${src_dir}/${3:-$2}/node-termination-handler" local -r nth_dir="${src_dir}/${3:-$2}/node-termination-handler"
if [[ -d "${nth_dir}" ]]; then if [[ -d "${nth_dir}" ]]; then
copy-manifests "${nth_dir}" "${dst_dir}" copy-manifests "${nth_dir}" "${dst_dir}"
@ -2440,7 +2440,7 @@ EOF
if [[ "${ENABLE_NVIDIA_GPU_DEVICE_PLUGIN:-}" == "true" ]]; then if [[ "${ENABLE_NVIDIA_GPU_DEVICE_PLUGIN:-}" == "true" ]]; then
setup-addon-manifests "addons" "device-plugins/nvidia-gpu" setup-addon-manifests "addons" "device-plugins/nvidia-gpu"
fi fi
if [[ "${ENABLE_NODE_TERMINATION_HANDLER}" == "true" ]]; then if [[ "${ENABLE_NODE_TERMINATION_HANDLER:-}" == "true" ]]; then
setup-addon-manifests "addons" "node-termination-handler" setup-addon-manifests "addons" "node-termination-handler"
setup-node-termination-handler-manifest setup-node-termination-handler-manifest
fi fi