mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 01:06:27 +00:00
Merge pull request #1544 from justinlindh/configurable-sleep-interval
Add configurable sleep between polling intervals for GCE status
This commit is contained in:
commit
90800bdc43
@ -29,3 +29,5 @@ MINION_TAG="${INSTANCE_PREFIX}-minion"
|
|||||||
MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}}))
|
MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}}))
|
||||||
MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
|
MINION_IP_RANGES=($(eval echo "10.244.{1..${NUM_MINIONS}}.0/24"))
|
||||||
MINION_SCOPES=""
|
MINION_SCOPES=""
|
||||||
|
# Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default.
|
||||||
|
POLL_SLEEP_INTERVAL=3
|
||||||
|
@ -29,3 +29,5 @@ MINION_TAG="${INSTANCE_PREFIX}-minion"
|
|||||||
MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}}))
|
MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}}))
|
||||||
MINION_IP_RANGES=($(eval echo "10.245.{1..${NUM_MINIONS}}.0/24"))
|
MINION_IP_RANGES=($(eval echo "10.245.{1..${NUM_MINIONS}}.0/24"))
|
||||||
MINION_SCOPES=""
|
MINION_SCOPES=""
|
||||||
|
# Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default.
|
||||||
|
POLL_SLEEP_INTERVAL=3
|
||||||
|
@ -149,14 +149,16 @@ function kube-up {
|
|||||||
# firewalls can be added concurrent with instance creation.
|
# firewalls can be added concurrent with instance creation.
|
||||||
gcutil addnetwork "${NETWORK}" --range "10.240.0.0/16"
|
gcutil addnetwork "${NETWORK}" --range "10.240.0.0/16"
|
||||||
gcutil addfirewall "${NETWORK}-default-internal" \
|
gcutil addfirewall "${NETWORK}-default-internal" \
|
||||||
--norespect_terminal_width \
|
|
||||||
--project "${PROJECT}" \
|
--project "${PROJECT}" \
|
||||||
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--network "${NETWORK}" \
|
--network "${NETWORK}" \
|
||||||
--allowed_ip_sources "10.0.0.0/8" \
|
--allowed_ip_sources "10.0.0.0/8" \
|
||||||
--allowed "tcp:1-65535,udp:1-65535,icmp" &
|
--allowed "tcp:1-65535,udp:1-65535,icmp" &
|
||||||
gcutil addfirewall "${NETWORK}-default-ssh" \
|
gcutil addfirewall "${NETWORK}-default-ssh" \
|
||||||
--norespect_terminal_width \
|
|
||||||
--project "${PROJECT}" \
|
--project "${PROJECT}" \
|
||||||
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--network "${NETWORK}" \
|
--network "${NETWORK}" \
|
||||||
--allowed_ip_sources "0.0.0.0/0" \
|
--allowed_ip_sources "0.0.0.0/0" \
|
||||||
--allowed "tcp:22" &
|
--allowed "tcp:22" &
|
||||||
@ -164,8 +166,9 @@ function kube-up {
|
|||||||
|
|
||||||
echo "Starting VMs and configuring firewalls"
|
echo "Starting VMs and configuring firewalls"
|
||||||
gcutil addfirewall ${MASTER_NAME}-https \
|
gcutil addfirewall ${MASTER_NAME}-https \
|
||||||
--norespect_terminal_width \
|
|
||||||
--project ${PROJECT} \
|
--project ${PROJECT} \
|
||||||
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--network ${NETWORK} \
|
--network ${NETWORK} \
|
||||||
--target_tags ${MASTER_TAG} \
|
--target_tags ${MASTER_TAG} \
|
||||||
--allowed tcp:443 &
|
--allowed tcp:443 &
|
||||||
@ -180,8 +183,9 @@ function kube-up {
|
|||||||
) > "${KUBE_TEMP}/master-start.sh"
|
) > "${KUBE_TEMP}/master-start.sh"
|
||||||
|
|
||||||
gcutil addinstance ${MASTER_NAME}\
|
gcutil addinstance ${MASTER_NAME}\
|
||||||
--norespect_terminal_width \
|
|
||||||
--project ${PROJECT} \
|
--project ${PROJECT} \
|
||||||
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--zone ${ZONE} \
|
--zone ${ZONE} \
|
||||||
--machine_type ${MASTER_SIZE} \
|
--machine_type ${MASTER_SIZE} \
|
||||||
--image ${IMAGE} \
|
--image ${IMAGE} \
|
||||||
@ -200,15 +204,17 @@ function kube-up {
|
|||||||
) > ${KUBE_TEMP}/minion-start-${i}.sh
|
) > ${KUBE_TEMP}/minion-start-${i}.sh
|
||||||
|
|
||||||
gcutil addfirewall ${MINION_NAMES[$i]}-all \
|
gcutil addfirewall ${MINION_NAMES[$i]}-all \
|
||||||
--norespect_terminal_width \
|
|
||||||
--project ${PROJECT} \
|
--project ${PROJECT} \
|
||||||
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--network ${NETWORK} \
|
--network ${NETWORK} \
|
||||||
--allowed_ip_sources ${MINION_IP_RANGES[$i]} \
|
--allowed_ip_sources ${MINION_IP_RANGES[$i]} \
|
||||||
--allowed "tcp,udp,icmp,esp,ah,sctp" &
|
--allowed "tcp,udp,icmp,esp,ah,sctp" &
|
||||||
|
|
||||||
gcutil addinstance ${MINION_NAMES[$i]} \
|
gcutil addinstance ${MINION_NAMES[$i]} \
|
||||||
--norespect_terminal_width \
|
|
||||||
--project ${PROJECT} \
|
--project ${PROJECT} \
|
||||||
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--zone ${ZONE} \
|
--zone ${ZONE} \
|
||||||
--machine_type ${MINION_SIZE} \
|
--machine_type ${MINION_SIZE} \
|
||||||
--image ${IMAGE} \
|
--image ${IMAGE} \
|
||||||
@ -220,8 +226,9 @@ function kube-up {
|
|||||||
--metadata_from_file "startup-script:${KUBE_TEMP}/minion-start-${i}.sh" &
|
--metadata_from_file "startup-script:${KUBE_TEMP}/minion-start-${i}.sh" &
|
||||||
|
|
||||||
gcutil addroute ${MINION_NAMES[$i]} ${MINION_IP_RANGES[$i]} \
|
gcutil addroute ${MINION_NAMES[$i]} ${MINION_IP_RANGES[$i]} \
|
||||||
--norespect_terminal_width \
|
|
||||||
--project ${PROJECT} \
|
--project ${PROJECT} \
|
||||||
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--network ${NETWORK} \
|
--network ${NETWORK} \
|
||||||
--next_hop_instance ${ZONE}/instances/${MINION_NAMES[$i]} &
|
--next_hop_instance ${ZONE}/instances/${MINION_NAMES[$i]} &
|
||||||
done
|
done
|
||||||
@ -313,12 +320,14 @@ function kube-down {
|
|||||||
gcutil deletefirewall \
|
gcutil deletefirewall \
|
||||||
--project ${PROJECT} \
|
--project ${PROJECT} \
|
||||||
--norespect_terminal_width \
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--force \
|
--force \
|
||||||
${MASTER_NAME}-https &
|
${MASTER_NAME}-https &
|
||||||
|
|
||||||
gcutil deleteinstance \
|
gcutil deleteinstance \
|
||||||
--project ${PROJECT} \
|
--project ${PROJECT} \
|
||||||
--norespect_terminal_width \
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--force \
|
--force \
|
||||||
--delete_boot_pd \
|
--delete_boot_pd \
|
||||||
--zone ${ZONE} \
|
--zone ${ZONE} \
|
||||||
@ -327,12 +336,14 @@ function kube-down {
|
|||||||
gcutil deletefirewall \
|
gcutil deletefirewall \
|
||||||
--project ${PROJECT} \
|
--project ${PROJECT} \
|
||||||
--norespect_terminal_width \
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--force \
|
--force \
|
||||||
${MINION_NAMES[*]/%/-all} &
|
${MINION_NAMES[*]/%/-all} &
|
||||||
|
|
||||||
gcutil deleteinstance \
|
gcutil deleteinstance \
|
||||||
--project ${PROJECT} \
|
--project ${PROJECT} \
|
||||||
--norespect_terminal_width \
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--force \
|
--force \
|
||||||
--delete_boot_pd \
|
--delete_boot_pd \
|
||||||
--zone ${ZONE} \
|
--zone ${ZONE} \
|
||||||
@ -340,6 +351,8 @@ function kube-down {
|
|||||||
|
|
||||||
gcutil deleteroute \
|
gcutil deleteroute \
|
||||||
--project ${PROJECT} \
|
--project ${PROJECT} \
|
||||||
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--force \
|
--force \
|
||||||
${MINION_NAMES[*]} &
|
${MINION_NAMES[*]} &
|
||||||
|
|
||||||
@ -396,8 +409,9 @@ function test-setup {
|
|||||||
if [[ ${ALREADY_UP} -ne 1 ]]; then
|
if [[ ${ALREADY_UP} -ne 1 ]]; then
|
||||||
# Open up port 80 & 8080 so common containers on minions can be reached
|
# Open up port 80 & 8080 so common containers on minions can be reached
|
||||||
gcutil addfirewall \
|
gcutil addfirewall \
|
||||||
--norespect_terminal_width \
|
|
||||||
--project ${PROJECT} \
|
--project ${PROJECT} \
|
||||||
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--target_tags ${MINION_TAG} \
|
--target_tags ${MINION_TAG} \
|
||||||
--allowed tcp:80,tcp:8080 \
|
--allowed tcp:80,tcp:8080 \
|
||||||
--network ${NETWORK} \
|
--network ${NETWORK} \
|
||||||
@ -412,6 +426,7 @@ function test-teardown {
|
|||||||
gcutil deletefirewall \
|
gcutil deletefirewall \
|
||||||
--project ${PROJECT} \
|
--project ${PROJECT} \
|
||||||
--norespect_terminal_width \
|
--norespect_terminal_width \
|
||||||
|
--sleep_between_polls "${POLL_SLEEP_INTERVAL}" \
|
||||||
--force \
|
--force \
|
||||||
${MINION_TAG}-${INSTANCE_PREFIX}-http-alt || true > /dev/null
|
${MINION_TAG}-${INSTANCE_PREFIX}-http-alt || true > /dev/null
|
||||||
$(dirname $0)/../cluster/kube-down.sh > /dev/null
|
$(dirname $0)/../cluster/kube-down.sh > /dev/null
|
||||||
|
Loading…
Reference in New Issue
Block a user