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

Merge pull request #95915 from wojtek-t/progress_notify_frequency

Browse Source 
Allow configuring etcd progress notify interval on GCE
This commit is contained in:
Kubernetes Prow Robot 2020-10-29 12:58:06 -07:00 committed by GitHub
commit 26c8ce57a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/gce/config-default.sh
View File

@ -550,5 +550,8 @@ export KUBE_APISERVER_HEALTHCHECK_ON_HOST_IP="${KUBE_APISERVER_HEALTHCHECK_ON_HO
# through host IP. # through host IP.
export ETCD_LISTEN_ON_HOST_IP="${ETCD_LISTEN_ON_HOST_IP:-false}" export ETCD_LISTEN_ON_HOST_IP="${ETCD_LISTEN_ON_HOST_IP:-false}"
# ETCD_PROGRESS_NOTIFY_INTERVAL defines the interval for etcd watch progress notify events.
export ETCD_PROGRESS_NOTIFY_INTERVAL="${ETCD_PROGRESS_NOTIFY_INTERVAL:-10m}"
# Use host IP instead of localhost in control plane kubeconfig files. # Use host IP instead of localhost in control plane kubeconfig files.
export KUBECONFIG_USE_HOST_IP="${KUBECONFIG_USE_HOST_IP:-false}" export KUBECONFIG_USE_HOST_IP="${KUBECONFIG_USE_HOST_IP:-false}"

3
cluster/gce/config-test.sh
View File

@ -586,5 +586,8 @@ export KUBE_APISERVER_HEALTHCHECK_ON_HOST_IP="${KUBE_APISERVER_HEALTHCHECK_ON_HO
# through host IP. # through host IP.
export ETCD_LISTEN_ON_HOST_IP="${ETCD_LISTEN_ON_HOST_IP:-false}" export ETCD_LISTEN_ON_HOST_IP="${ETCD_LISTEN_ON_HOST_IP:-false}"
# ETCD_PROGRESS_NOTIFY_INTERVAL defines the interval for etcd watch progress notify events.
export ETCD_PROGRESS_NOTIFY_INTERVAL="${ETCD_PROGRESS_NOTIFY_INTERVAL:-10m}"
# Use host IP instead of localhost in control plane kubeconfig files. # Use host IP instead of localhost in control plane kubeconfig files.
export KUBECONFIG_USE_HOST_IP="${KUBECONFIG_USE_HOST_IP:-false}" export KUBECONFIG_USE_HOST_IP="${KUBECONFIG_USE_HOST_IP:-false}"

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

@ -1748,6 +1748,10 @@ function prepare-etcd-manifest {
etcd_extra_args+=" --listen-metrics-urls=${etcd_listen_metrics_urls} " etcd_extra_args+=" --listen-metrics-urls=${etcd_listen_metrics_urls} "
fi fi
if [[ -n "${ETCD_PROGRESS_NOTIFY_INTERVAL:-}" ]]; then
etcd_extra_args+=" --experimental-watch-progress-notify-interval=${ETCD_PROGRESS_NOTIFY_INTERVAL}"
fi
# If etcd is configured to listen on host IP, an additional client listening URL is added. # If etcd is configured to listen on host IP, an additional client listening URL is added.
local etcd_listen_client_urls="${etcd_apiserver_protocol}://${ETCD_LISTEN_CLIENT_IP:-127.0.0.1}:$2" local etcd_listen_client_urls="${etcd_apiserver_protocol}://${ETCD_LISTEN_CLIENT_IP:-127.0.0.1}:$2"
if [[ ${ETCD_LISTEN_ON_HOST_IP:-} == "true" ]] ; then if [[ ${ETCD_LISTEN_ON_HOST_IP:-} == "true" ]] ; then

5
cluster/gce/util.sh
View File

@ -1459,6 +1459,11 @@ EOF
if [ -n "${ETCD_LISTEN_CLIENT_IP:-}" ]; then if [ -n "${ETCD_LISTEN_CLIENT_IP:-}" ]; then
cat >>"$file" <<EOF cat >>"$file" <<EOF
ETCD_LISTEN_CLIENT_IP: $(yaml-quote "${ETCD_LISTEN_CLIENT_IP}") ETCD_LISTEN_CLIENT_IP: $(yaml-quote "${ETCD_LISTEN_CLIENT_IP}")
EOF
fi
if [ -n "${ETCD_PROGRESS_NOTIFY_INTERVAL:-}" ]; then
cat >>"$file" <<EOF
ETCD_PROGRESS_NOTIFY_INTERVAL: $(yaml-quote "${ETCD_PROGRESS_NOTIFY_INTERVAL}")
EOF EOF
fi fi