diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 8b200f6bfd4..4d628647f30 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -118,7 +118,7 @@ func NewCMServer() *CMServer { NodeSyncPeriod: 10 * time.Second, ResourceQuotaSyncPeriod: 10 * time.Second, NamespaceSyncPeriod: 5 * time.Minute, - PVClaimBinderSyncPeriod: 10 * time.Second, + PVClaimBinderSyncPeriod: 10 * time.Minute, HorizontalPodAutoscalerSyncPeriod: 30 * time.Second, DeploymentControllerSyncPeriod: 30 * time.Second, MinResyncPeriod: 12 * time.Hour, diff --git a/docs/admin/kube-controller-manager.md b/docs/admin/kube-controller-manager.md index d5813bf380c..942a47ba13b 100644 --- a/docs/admin/kube-controller-manager.md +++ b/docs/admin/kube-controller-manager.md @@ -87,7 +87,7 @@ kube-controller-manager --pv-recycler-pod-template-filepath-hostpath="": The file path to a pod definition used as a template for HostPath persistent volume recycling. This is for development and testing only and will not work in a multi-node cluster. --pv-recycler-pod-template-filepath-nfs="": The file path to a pod definition used as a template for NFS persistent volume recycling --pv-recycler-timeout-increment-hostpath=30: the increment of time added per Gi to ActiveDeadlineSeconds for a HostPath scrubber pod. This is for development and testing only and will not work in a multi-node cluster. - --pvclaimbinder-sync-period=10s: The period for syncing persistent volumes and persistent volume claims + --pvclaimbinder-sync-period=10m0s: The period for syncing persistent volumes and persistent volume claims --resource-quota-sync-period=10s: The period for syncing quota usage status in the system --root-ca-file="": If set, this root certificate authority will be included in service account's token secret. This must be a valid PEM-encoded CA bundle. --service-account-private-key-file="": Filename containing a PEM-encoded private RSA key used to sign service account tokens. @@ -95,7 +95,7 @@ kube-controller-manager --terminated-pod-gc-threshold=12500: Number of terminated pods that can exist before the terminated pod garbage collector starts deleting terminated pods. If <= 0, the terminated pod garbage collector is disabled. ``` -###### Auto generated by spf13/cobra on 18-Oct-2015 +###### Auto generated by spf13/cobra on 4-Nov-2015