kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9925 from olemarkus/cas-fixes 

Add missing flags to cluster autoscaler template
This commit is contained in:
Kubernetes Prow Robot 2020-09-13 00:58:57 -07:00 committed by GitHub
parent 3fa13d30bd 2b5950c24c
commit 58092b5666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/model/components/clusterautoscaler.go
View File

@ -77,6 +77,9 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
if cas.SkipNodesWithSystemPods == nil {
cas.SkipNodesWithSystemPods = fi.Bool(true)
}
if cas.BalanceSimilarNodeGroups == nil {
cas.BalanceSimilarNodeGroups = fi.Bool(false)
}
return nil
}

21
upup/models/bindata.go
View File

@ -856,7 +856,8 @@ func cloudupResourcesAddonsAuthenticationKopeIoK8s18Yaml() (*asset, error) {
return a, nil
}
var _cloudupResourcesAddonsClusterAutoscalerAddonsK8sIoK8s115YamlTemplate = []byte(`# Sourced from https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler/cloudprovider/aws/examples
var _cloudupResourcesAddonsClusterAutoscalerAddonsK8sIoK8s115YamlTemplate = []byte(`{{ with .ClusterAutoscaler }}
# Sourced from https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler/cloudprovider/aws/examples
---
apiVersion: v1
kind: ServiceAccount
@ -999,7 +1000,7 @@ spec:
nodeSelector:
node-role.kubernetes.io/master: ""
containers:
- image: {{ .ClusterAutoscaler.Image }}
- image: {{ .Image }}
name: cluster-autoscaler
resources:
limits:
@ -1010,14 +1011,17 @@ spec:
memory: 300Mi
command:
- ./cluster-autoscaler
- --v=2
- --stderrthreshold=info
- --cloud-provider={{ .CloudProvider }}
- --skip-nodes-with-local-storage={{ .ClusterAutoscaler.SkipNodesWithLocalStorage }}
- --expander={{ .ClusterAutoscaler.Expander }}
- --balance-similar-node-groups={{ .BalanceSimilarNodeGroups }}
- --cloud-provider={{ $.CloudProvider }}
- --expander={{ .Expander }}
{{ range $name, $spec := GetNodeInstanceGroups }}
- --nodes={{ $spec.MinSize }}:{{ $spec.MaxSize }}:{{ $name }}
{{ end }}
- --scale-down-utilization-threshold={{ .ScaleDownUtilizationThreshold }}
- --skip-nodes-with-local-storage={{ .SkipNodesWithLocalStorage }}
- --skip-nodes-with-system-pods={{ .SkipNodesWithSystemPods }}
- --stderrthreshold=info
- --v=2
ports:
- containerPort: 8085
protocol: TCP
@ -1029,7 +1033,8 @@ spec:
scheme: HTTP
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1`)
timeoutSeconds: 1
{{ end }}`)
func cloudupResourcesAddonsClusterAutoscalerAddonsK8sIoK8s115YamlTemplateBytes() ([]byte, error) {
return _cloudupResourcesAddonsClusterAutoscalerAddonsK8sIoK8s115YamlTemplate, nil

19
upup/models/cloudup/resources/addons/cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml.template
View File

@ -1,3 +1,4 @@
{{ with .ClusterAutoscaler }}
# Sourced from https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler/cloudprovider/aws/examples
---
apiVersion: v1
@ -141,7 +142,7 @@ spec:
nodeSelector:
node-role.kubernetes.io/master: ""
containers:
- image: {{ .ClusterAutoscaler.Image }}
- image: {{ .Image }}
name: cluster-autoscaler
resources:
limits:
@ -152,14 +153,17 @@ spec:
memory: 300Mi
command:
- ./cluster-autoscaler
- --v=2
- --stderrthreshold=info
- --cloud-provider={{ .CloudProvider }}
- --skip-nodes-with-local-storage={{ .ClusterAutoscaler.SkipNodesWithLocalStorage }}
- --expander={{ .ClusterAutoscaler.Expander }}
- --balance-similar-node-groups={{ .BalanceSimilarNodeGroups }}
- --cloud-provider={{ $.CloudProvider }}
- --expander={{ .Expander }}
{{ range $name, $spec := GetNodeInstanceGroups }}
- --nodes={{ $spec.MinSize }}:{{ $spec.MaxSize }}:{{ $name }}
{{ end }}
- --scale-down-utilization-threshold={{ .ScaleDownUtilizationThreshold }}
- --skip-nodes-with-local-storage={{ .SkipNodesWithLocalStorage }}
- --skip-nodes-with-system-pods={{ .SkipNodesWithSystemPods }}
- --stderrthreshold=info
- --v=2
ports:
- containerPort: 8085
protocol: TCP
@ -171,4 +175,5 @@ spec:
scheme: HTTP
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
timeoutSeconds: 1
{{ end }}