From df5eb50139637a54ace48d4220fdb795e171c712 Mon Sep 17 00:00:00 2001 From: chrislovecnm Date: Mon, 9 Jan 2017 16:01:01 -0700 Subject: [PATCH] reseting default, and renaming flags --- cmd/kube-controller-manager/app/options/options.go | 6 +++--- hack/verify-flags/known-flags.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index c26d2f8da9390..5c18f02062cbd 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -95,7 +95,7 @@ func NewCMServer() *CMServer { ConcurrentGCSyncs: 20, ClusterSigningCertFile: "/etc/kubernetes/ca/ca.pem", ClusterSigningKeyFile: "/etc/kubernetes/ca/ca.key", - ReconcilerSyncLoopPeriod: metav1.Duration{Duration: 1 * time.Minute}, + ReconcilerSyncLoopPeriod: metav1.Duration{Duration: 5 * time.Second}, }, } s.LeaderElection.LeaderElect = true @@ -182,8 +182,8 @@ func (s *CMServer) AddFlags(fs *pflag.FlagSet) { fs.Float32Var(&s.SecondaryNodeEvictionRate, "secondary-node-eviction-rate", 0.01, "Number of nodes per second on which pods are deleted in case of node failure when a zone is unhealthy (see --unhealthy-zone-threshold for definition of healthy/unhealthy). Zone refers to entire cluster in non-multizone clusters. This value is implicitly overridden to 0 if the cluster size is smaller than --large-cluster-size-threshold.") fs.Int32Var(&s.LargeClusterSizeThreshold, "large-cluster-size-threshold", 50, "Number of nodes from which NodeController treats the cluster as large for the eviction logic purposes. --secondary-node-eviction-rate is implicitly overridden to 0 for clusters this size or smaller.") fs.Float32Var(&s.UnhealthyZoneThreshold, "unhealthy-zone-threshold", 0.55, "Fraction of Nodes in a zone which needs to be not Ready (minimum 3) for zone to be treated as unhealthy. ") - fs.BoolVar(&s.DisableAttachDetachReconcilerSync, "disable-attach-detach-reconcile", false, "Disable volume attach detach reconciler sync.") - fs.DurationVar(&s.ReconcilerSyncLoopPeriod.Duration, "reconcile-sync-loop-period", s.ReconcilerSyncLoopPeriod.Duration, "The reconciler sync wait time between volume attach detach.") + fs.BoolVar(&s.DisableAttachDetachReconcilerSync, "disable-attach-detach-reconcile", false, "Disable volume attach detach reconciler sync. Disabling this may cause volumes to be mismatched with pods. Use wisely.") + fs.DurationVar(&s.ReconcilerSyncLoopPeriod.Duration, "attach-detach-reconcile-period", s.ReconcilerSyncLoopPeriod.Duration, "The reconciler sync wait time between volume attach detach. This duration must be larger than one second, and increasing this value from the default my allow for volume mismatches.") leaderelection.BindFlags(&s.LeaderElection, fs) config.DefaultFeatureGate.AddFlag(fs) diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt index 10b5e99105859..9a9ecf6b19171 100644 --- a/hack/verify-flags/known-flags.txt +++ b/hack/verify-flags/known-flags.txt @@ -636,4 +636,4 @@ viper-config log-lines-total run-duration disable-attach-detach-reconcile -reconcile-sync-loop-period +attach-detach-reconcile-period