Allow for HPA Autoscaling delay times to be configured in cluster.yaml (

#10) * Allow for HPA Autoscaling delay times to be configured in cluster.yaml * Reformat
iflix · Feb 6, 2018 · 9adc47b · 9adc47b
1 parent 51808b8
commit 9adc47b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 13 deletions.
diff --git a/core/controlplane/config/config.go b/core/controlplane/config/config.go
@@ -537,19 +537,21 @@ type Experimental struct {
 	AwsNodeLabels  AwsNodeLabels  `yaml:"awsNodeLabels"`
 	// When cluster-autoscaler support is enabled, not only controller nodes but this node pool is also given
 	// a node label and IAM permissions to run cluster-autoscaler
-	ClusterAutoscalerSupport    model.ClusterAutoscalerSupport `yaml:"clusterAutoscalerSupport"`
-	TLSBootstrap                TLSBootstrap                   `yaml:"tlsBootstrap"`
-	NodeAuthorizer              NodeAuthorizer                 `yaml:"nodeAuthorizer"`
-	EphemeralImageStorage       EphemeralImageStorage          `yaml:"ephemeralImageStorage"`
-	Kube2IamSupport             Kube2IamSupport                `yaml:"kube2IamSupport,omitempty"`
-	KubeletOpts                 string                         `yaml:"kubeletOpts,omitempty"`
-	LoadBalancer                LoadBalancer                   `yaml:"loadBalancer"`
-	TargetGroup                 TargetGroup                    `yaml:"targetGroup"`
-	NodeDrainer                 model.NodeDrainer              `yaml:"nodeDrainer"`
-	Oidc                        model.Oidc                     `yaml:"oidc"`
-	DisableSecurityGroupIngress bool                           `yaml:"disableSecurityGroupIngress"`
-	NodeMonitorGracePeriod      string                         `yaml:"nodeMonitorGracePeriod"`
-	model.UnknownKeys           `yaml:",inline"`
+	ClusterAutoscalerSupport              model.ClusterAutoscalerSupport `yaml:"clusterAutoscalerSupport"`
+	TLSBootstrap                          TLSBootstrap                   `yaml:"tlsBootstrap"`
+	NodeAuthorizer                        NodeAuthorizer                 `yaml:"nodeAuthorizer"`
+	EphemeralImageStorage                 EphemeralImageStorage          `yaml:"ephemeralImageStorage"`
+	Kube2IamSupport                       Kube2IamSupport                `yaml:"kube2IamSupport,omitempty"`
+	KubeletOpts                           string                         `yaml:"kubeletOpts,omitempty"`
+	LoadBalancer                          LoadBalancer                   `yaml:"loadBalancer"`
+	TargetGroup                           TargetGroup                    `yaml:"targetGroup"`
+	NodeDrainer                           model.NodeDrainer              `yaml:"nodeDrainer"`
+	Oidc                                  model.Oidc                     `yaml:"oidc"`
+	DisableSecurityGroupIngress           bool                           `yaml:"disableSecurityGroupIngress"`
+	NodeMonitorGracePeriod                string                         `yaml:"nodeMonitorGracePeriod"`
+	HorizontalPodAutoscalerDownscaleDelay string                         `yaml:"horizontalPodAutoscalerDownscaleDelay"`
+	HorizontalPodAutoscalerUpscaleDelay   string                         `yaml:"horizontalPodAutoscalerUpscaleDelay"`
+	model.UnknownKeys                     `yaml:",inline"`
 }
 
 type Admission struct {

diff --git a/core/controlplane/config/templates/cloud-config-controller b/core/controlplane/config/templates/cloud-config-controller
@@ -2192,6 +2192,12 @@ write_files:
           {{if .Experimental.DisableSecurityGroupIngress}}
           - --cloud-config=/etc/kubernetes/additional-configs/cloud.config
           {{end}}
+          {{if .Experimental.HorizontalPodAutoscalerDownscaleDelay}}
+          - --horizontal-pod-autoscaler-downscale-delay={{ .Experimental.HorizontalPodAutoscalerDownscaleDelay }}
+          {{end}}
+          {{if .Experimental.HorizontalPodAutoscalerUpscaleDelay}}
+          - --horizontal-pod-autoscaler-upscale-delay={{ .Experimental.HorizontalPodAutoscalerUpscaleDelay }}
+          {{end}}
           resources:
             requests:
               cpu: 200m

diff --git a/core/controlplane/config/templates/cluster.yaml b/core/controlplane/config/templates/cluster.yaml
@@ -1317,6 +1317,8 @@ experimental:
   # This is the amount of time which we allow running Node to be unresponsive before marking it unhealthy.
   # Must be N times more than kubelet's nodeStatusUpdateFrequency (default 10s).
 #   nodeMonitorGracePeriod: "40s"
+#   horizontalPodAutoscalerDownscaleDelay: "5m0s"
+#   horizontalPodAutoscalerUpscaleDelay: "3m0s"
 
 kubelet:
   # Tell Kubelet to renew its certificate as its expiration time is approaching

diff --git a/docs/advanced-topics/hpa-scaling.md b/docs/advanced-topics/hpa-scaling.md
@@ -0,0 +1,14 @@
+# HPA Autoscaling
+
+The controller-manager manages the autoscaling of pods across the cluster. 
+It uses the following parameters to manage the cooldown/delays.
+
+- --horizontal-pod-autoscaler-downscale-delay (default 5m0s)
+- --horizontal-pod-autoscaler-upscale-delay (default 3m0s)
+
+For example if you want to override these values you can do the following:
+```yaml
+experimental:
+  horizontalPodAutoscalerDownscaleDelay: 1m0s
+  horizontalPodAutoscalerUpscaleDelay: 30s
+```