test/integration: enable experimental-watch-progress-notify-interval …

…flag for etcd

The experimental-watch-progress-notify-interval flag specifies an interval at which etcd sends data to the kube-api server.

It is used by the WatchBookmark feature ( kube-apiserver) which is GA since 1.17.
It will also be used by a new WatchList and WatchListClient features which are targeted to Beta in this release (1.30)
All GCE tests set the flag as well.

Given the above, a default installation must pass the flag required by the kube-apiserver to etcd. Otherwise, some features will not work.

etcd-io/etcd#13779 tracks stabilization of the flag in etcd.

hack/lib/etcd.sh

@@ -24,6 +24,8 @@ ETCD_PORT=${ETCD_PORT:-2379}
 # to the command line argument, even when both have the same value.
 ETCD_LOGLEVEL=${ETCD_LOGLEVEL:-warn}
 export KUBE_INTEGRATION_ETCD_URL="http://${ETCD_HOST}:${ETCD_PORT}"
+# ETCD_PROGRESS_NOTIFY_INTERVAL defines the interval for etcd watch progress notify events in seconds.
+ETCD_PROGRESS_NOTIFY_INTERVAL="${ETCD_PROGRESS_NOTIFY_INTERVAL:-5s}"
 
 kube::etcd::validate() {
   # validate if in path
@@ -84,8 +86,8 @@ kube::etcd::start() {
   else
     ETCD_LOGFILE=${ETCD_LOGFILE:-"/dev/null"}
   fi
-  kube::log::info "etcd --advertise-client-urls ${KUBE_INTEGRATION_ETCD_URL} --data-dir ${ETCD_DIR} --listen-client-urls http://${ETCD_HOST}:${ETCD_PORT} --log-level=${ETCD_LOGLEVEL} 2> \"${ETCD_LOGFILE}\" >/dev/null"
-  etcd --advertise-client-urls "${KUBE_INTEGRATION_ETCD_URL}" --data-dir "${ETCD_DIR}" --listen-client-urls "${KUBE_INTEGRATION_ETCD_URL}" --log-level="${ETCD_LOGLEVEL}" 2> "${ETCD_LOGFILE}" >/dev/null &
+  kube::log::info "etcd --advertise-client-urls ${KUBE_INTEGRATION_ETCD_URL} --data-dir ${ETCD_DIR} --listen-client-urls http://${ETCD_HOST}:${ETCD_PORT} --log-level=${ETCD_LOGLEVEL} --experimental-watch-progress-notify-interval ${ETCD_PROGRESS_NOTIFY_INTERVAL} 2> \"${ETCD_LOGFILE}\" >/dev/null"
+  etcd --advertise-client-urls "${KUBE_INTEGRATION_ETCD_URL}" --data-dir "${ETCD_DIR}" --listen-client-urls "${KUBE_INTEGRATION_ETCD_URL}" --log-level="${ETCD_LOGLEVEL}" --experimental-watch-progress-notify-interval "${ETCD_PROGRESS_NOTIFY_INTERVAL}" 2> "${ETCD_LOGFILE}" >/dev/null &
   ETCD_PID=$!
 
   echo "Waiting for etcd to come up."

test/integration/framework/etcd.go

@@ -74,7 +74,8 @@ func startEtcd(output io.Writer) (func(), error) {
 	}
 	klog.V(1).Infof("could not connect to etcd: %v", err)
 
-	currentURL, stop, err := RunCustomEtcd("integration_test_etcd_data", nil, output)
+	etcdArgs := []string{"--experimental-watch-progress-notify-interval", "5s"}
+	currentURL, stop, err := RunCustomEtcd("integration_test_etcd_data", etcdArgs, output)
 	if err != nil {
 		return nil, err
 	}