Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions pkg/model/components/clusterautoscaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,20 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o *kops.Cluster) error {
v, err := util.ParseKubernetesVersion(clusterSpec.KubernetesVersion)
if err == nil {
switch v.Minor {
case 27:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.27.7"
case 28:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.28.4"
case 29:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.29.2"
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.29.5"
case 30:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0"
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.6"
case 31:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.31.4"
case 32:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3"
case 33:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.33.1"
case 34:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.34.0"
default:
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0"
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.34.0"
}
}
cas.Image = fi.PtrTo(image)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
version: 9.99.0
- id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: a3dabf22247ebe9511c5714760fffbe206397f265fe710caa73b6162678f3f68
manifestHash: 24e40b2ae4ba70890a5f4e345786cf9d6570fe434542da8cfada479666464cf8
name: cluster-autoscaler.addons.k8s.io
selector:
k8s-addon: cluster-autoscaler.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ spec:
env:
- name: AWS_REGION
value: us-test-1
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
enabled: true
expander: priority
ignoreDaemonSetsUtilization: false
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3
maxNodeProvisionTime: 15m0s
newPodScaleUpDelay: 0s
scaleDownDelayAfterAdd: 10m0s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
version: 9.99.0
- id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: 29605e5dcd67d0676c67d06dc59a3aaf5e28ecc6a4d8682956b928664b684fd2
manifestHash: 506b93bff5984eae4003fa3f3e36570de4752ea69209840820a1c404d5c8e30d
name: cluster-autoscaler.addons.k8s.io
selector:
k8s-addon: cluster-autoscaler.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ spec:
env:
- name: AWS_REGION
value: us-test-1
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
enabled: true
expander: priority
ignoreDaemonSetsUtilization: false
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3
maxNodeProvisionTime: 15m0s
newPodScaleUpDelay: 0s
scaleDownDelayAfterAdd: 10m0s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
enabled: true
expander: random
ignoreDaemonSetsUtilization: false
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3
maxNodeProvisionTime: 15m0s
newPodScaleUpDelay: 0s
scaleDownDelayAfterAdd: 10m0s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
version: 9.99.0
- id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: dbc0df294fcd14e5e160aee8184a0a44f8f19b1405ba6e59df9bc374744cc550
manifestHash: 0200a5125c38990dc35739bd9ae6bcaf95ebdb43cc340b38888bcc921bd9a714
name: cluster-autoscaler.addons.k8s.io
selector:
k8s-addon: cluster-autoscaler.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/cluster-autoscaler.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
enabled: true
expander: random
ignoreDaemonSetsUtilization: false
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3
maxNodeProvisionTime: 15m0s
newPodScaleUpDelay: 0s
scaleDownDelayAfterAdd: 10m0s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
version: 9.99.0
- id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: d5dcf7453514dd91793ba54ba4e6f1324e6950474124da5cb6b9a5d710770970
manifestHash: 05365d30957a0f36372c6d718d3bd198b62b2fa08d6ab69a52df0deab946dc0f
name: cluster-autoscaler.addons.k8s.io
selector:
k8s-addon: cluster-autoscaler.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ spec:
env:
- name: AWS_REGION
value: us-test-1
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
enabled: true
expander: random
ignoreDaemonSetsUtilization: false
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3
maxNodeProvisionTime: 15m0s
newPodScaleUpDelay: 0s
scaleDownDelayAfterAdd: 10m0s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
version: 9.99.0
- id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: 7aaa72ea23224ce59b6009ea711f2cc50f20279aa586e7aa1f75961f990f103b
manifestHash: 4bf60d146672a175f2763f38519d366bf5538bf44c3a6eca3d69ec964f575eff
name: cluster-autoscaler.addons.k8s.io
selector:
k8s-addon: cluster-autoscaler.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ spec:
- --logtostderr=true
- --stderrthreshold=info
- --v=4
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
enabled: true
expander: random
ignoreDaemonSetsUtilization: false
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3
maxNodeProvisionTime: 15m0s
newPodScaleUpDelay: 0s
podAnnotations:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
version: 9.99.0
- id: k8s-1.15
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
manifestHash: bb64e4cd537511ccc8275e6e20cc77d1410916ac81325ec0e4e2f05462bde200
manifestHash: c2a7f4f3e7e67c2ed9b3d934daf84d979272502b78d30d37c80a81baa22e5936
name: cluster-autoscaler.addons.k8s.io
selector:
k8s-addon: cluster-autoscaler.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ spec:
env:
- name: AWS_REGION
value: us-test-1
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.3
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down
Loading