From eb63da77ea59af34033feb39bc8ccb5ce57c14a0 Mon Sep 17 00:00:00 2001
From: wojtekt <wojtekt@google.com>
Date: Thu, 29 Oct 2020 15:43:51 +0100
Subject: [PATCH] Allow for configuring etcd progress notify interval on GCE

---
 cluster/gce/config-default.sh       | 3 +++
 cluster/gce/config-test.sh          | 3 +++
 cluster/gce/gci/configure-helper.sh | 4 ++++
 cluster/gce/util.sh                 | 5 +++++
 4 files changed, 15 insertions(+)

diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
index fab25267961..04b4c21d89e 100755
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -550,5 +550,8 @@ export KUBE_APISERVER_HEALTHCHECK_ON_HOST_IP="${KUBE_APISERVER_HEALTHCHECK_ON_HO
 # through host IP.
 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.
 export KUBECONFIG_USE_HOST_IP="${KUBECONFIG_USE_HOST_IP:-false}"
diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index ba9ed4d043a..eb2273bf755 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -586,5 +586,8 @@ export KUBE_APISERVER_HEALTHCHECK_ON_HOST_IP="${KUBE_APISERVER_HEALTHCHECK_ON_HO
 # through host IP.
 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.
 export KUBECONFIG_USE_HOST_IP="${KUBECONFIG_USE_HOST_IP:-false}"
diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index 9270e3ce492..264f92d9b69 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1748,6 +1748,10 @@ function prepare-etcd-manifest {
     etcd_extra_args+=" --listen-metrics-urls=${etcd_listen_metrics_urls} "
   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.
   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
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 5e0bfa4ff58..aedae8fed6a 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -1459,6 +1459,11 @@ EOF
     if [ -n "${ETCD_LISTEN_CLIENT_IP:-}" ]; then
       cat >>"$file" <<EOF
 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
     fi