Merge pull request #10281 from dntosas/cluster-autoscaler-improvements

[addons/CA] Add support for specifying resources and metrics
kubernetes · Jan 11, 2021 · 695be26 · 695be26
2 parents 7898779 + 56fe4ba
commit 695be26
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 10 deletions.
diff --git a/docs/cluster_spec.md b/docs/cluster_spec.md
@@ -710,6 +710,23 @@ spec:
 
 For more details on `horizontalPodAutoscaler` flags see the [official HPA docs](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) and the [kOps guides on how to set it up](horizontal_pod_autoscaling.md).
 
+## Cluster autoscaler
+{{ kops_feature_table(kops_added_default='1.19', k8s_min='1.15') }}
+
+Cluster autoscaler can be enabled to automatically adjust the size of the kubernetes cluster.
+
+```yaml
+spec:
+  clusterAutoscaler:
+    enabled: true
+    skipNodesWithLocalStorage: true
+    skipNodesWithSystemPods: true
+    cpuRequest: "100m"
+    memoryRequest: "300Mi"
+```
+
+Read more about cluster autoscaler in the [official documentation](https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler).
+
 ###  Feature Gates
 
 Feature gates can be configured on the kubelet.

diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -459,6 +459,14 @@ spec:
                     description: 'BalanceSimilarNodeGroups makes cluster autoscaler
                       treat similar node groups as one. Default: false'
                     type: boolean
+                  cpuRequest:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: 'CPURequest of cluster autoscaler container. Default:
+                      100m'
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
                   enabled:
                     description: 'Enabled enables the cluster autoscaler. Default:
                       false'
@@ -472,6 +480,14 @@ spec:
                     description: 'Image is the docker container used. Default: the
                       latest supported image for the specified kubernetes version.'
                     type: string
+                  memoryRequest:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: 'MemoryRequest of cluster autoscaler container. Default:
+                      300Mi'
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
                   newPodScaleUpDelay:
                     description: 'NewPodScaleUpDelay causes cluster autoscaler to
                       ignore unschedulable pods until they are a certain "age", regardless

diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
@@ -856,6 +856,12 @@ type ClusterAutoscalerConfig struct {
 	// Image is the docker container used.
 	// Default: the latest supported image for the specified kubernetes version.
 	Image *string `json:"image,omitempty"`
+	// MemoryRequest of cluster autoscaler container.
+	// Default: 300Mi
+	MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
+	// CPURequest of cluster autoscaler container.
+	// Default: 100m
+	CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
 }
 
 // MetricsServerConfig determines the metrics server configuration.

diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -855,6 +855,12 @@ type ClusterAutoscalerConfig struct {
 	// Image is the docker container used.
 	// Default: the latest supported image for the specified kubernetes version.
 	Image *string `json:"image,omitempty"`
+	// MemoryRequest of cluster autoscaler container.
+	// Default: 300Mi
+	MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
+	// CPURequest of cluster autoscaler container.
+	// Default: 100m
+	CPURequest *resource.Quantity `json:"cpuRequest,omitempty"`
 }
 
 // MetricsServerConfig determines the metrics server configuration.

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
diff --git a/pkg/model/components/clusterautoscaler.go b/pkg/model/components/clusterautoscaler.go
@@ -44,13 +44,13 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
 		if err == nil {
 			switch v.Minor {
 			case 19:
-				image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.19.0"
+				image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.19.1"
 			case 18:
-				image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.18.2"
+				image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.18.3"
 			case 17:
-				image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.17.3"
+				image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.17.4"
 			case 16:
-				image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.16.6"
+				image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.16.7"
 			case 15:
 				image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.15.7"
 			case 14:

diff --git a/upup/models/bindata.go b/upup/models/bindata.go
diff --git a/upup/models/cloudup/resources/addons/cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml.template b/upup/models/cloudup/resources/addons/cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml.template
@@ -134,6 +134,10 @@ spec:
     metadata:
       labels:
         app: cluster-autoscaler
+      annotations:
+        prometheus.io/path: "/metrics"
+        prometheus.io/port: "8085"
+        prometheus.io/scrape: "true"
     spec:
       serviceAccountName: cluster-autoscaler
       tolerations:
@@ -146,8 +150,8 @@ spec:
           name: cluster-autoscaler
           resources:
             requests:
-              cpu: 100m
-              memory: 300Mi
+              cpu: {{ or .CPURequest "100m"}}
+              memory: {{ or .MemoryRequest "300Mi"}}
           command:
             - ./cluster-autoscaler
             - --balance-similar-node-groups={{ .BalanceSimilarNodeGroups }}
@@ -174,4 +178,4 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 1
-{{ end }}
+{{ end }}