From 3a5d4d25bfb2e73d51ed4f0e678bffe8b8275a6d Mon Sep 17 00:00:00 2001 From: wojtekt Date: Fri, 12 Feb 2021 11:32:59 +0100 Subject: [PATCH 1/2] Set progress-notify-interval to 5s for GCE provider --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index d1f447140cd..6211a74c57c 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -552,7 +552,7 @@ export ENABLE_CSI_PROXY="${ENABLE_CSI_PROXY:-true}" export KUBE_APISERVER_HEALTHCHECK_ON_HOST_IP="${KUBE_APISERVER_HEALTHCHECK_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}" +export ETCD_PROGRESS_NOTIFY_INTERVAL="${ETCD_PROGRESS_NOTIFY_INTERVAL:-5s}" # Optional: Install Pigz on Windows. # Pigz is a multi-core optimized version of unzip.exe. diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 81a5a9d80be..80bbbee499a 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -593,7 +593,7 @@ export ENABLE_CSI_PROXY="${ENABLE_CSI_PROXY:-true}" export KUBE_APISERVER_HEALTHCHECK_ON_HOST_IP="${KUBE_APISERVER_HEALTHCHECK_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}" +export ETCD_PROGRESS_NOTIFY_INTERVAL="${ETCD_PROGRESS_NOTIFY_INTERVAL:-5s}" # Optional: Install Pigz on Windows. # Pigz is a multi-core optimized version of unzip.exe. From 6b3b561bc0eaba67de5b7543a64cbf3c65cc893a Mon Sep 17 00:00:00 2001 From: wojtekt Date: Fri, 12 Feb 2021 11:33:48 +0100 Subject: [PATCH 2/2] Promote efficient watch resumption to beta --- staging/src/k8s.io/apiserver/pkg/features/kube_features.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go index 612be9845a2..f7706c24815 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -151,6 +151,7 @@ const ( // owner: @wojtek-t // alpha: v1.20 + // beta: v1.21 // // Allows for updating watchcache resource version with progress notify events. EfficientWatchResumption featuregate.Feature = "EfficientWatchResumption" @@ -185,6 +186,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS RemoveSelfLink: {Default: true, PreRelease: featuregate.Beta}, SelectorIndex: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, WarningHeaders: {Default: true, PreRelease: featuregate.Beta}, - EfficientWatchResumption: {Default: false, PreRelease: featuregate.Alpha}, + EfficientWatchResumption: {Default: true, PreRelease: featuregate.Beta}, APIServerIdentity: {Default: false, PreRelease: featuregate.Alpha}, }