Skip to content

Commit 6da1b66

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17727 from hakman/automated-cherry-pick-of-#17640-#17725-upstream-release-1.33
Automated cherry pick of #17640: Update cluster-autoscaler to v1.34.0 releases #17725: Update cluster-autoscaler to v1.34.1
2 parents 6ee92f2 + c44d428 commit 6da1b66

File tree

20 files changed

+36
-21
lines changed

20 files changed

+36
-21
lines changed

‎pkg/model/components/clusterautoscaler.go‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,19 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o *kops.Cluster) error {
4848
case 28:
4949
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.28.4"
5050
case 29:
51-
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.29.2"
51+
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.29.5"
5252
case 30:
53-
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0"
53+
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.7"
54+
case 31:
55+
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.31.5"
56+
case 32:
57+
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.4"
58+
case 33:
59+
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.33.2"
60+
case 34:
61+
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.34.1"
5462
default:
55-
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0"
63+
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.34.1"
5664
}
5765
}
5866
cas.Image = fi.PtrTo(image)

‎tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
version: 9.99.0
4242
- id: k8s-1.15
4343
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
44-
manifestHash: a3dabf22247ebe9511c5714760fffbe206397f265fe710caa73b6162678f3f68
44+
manifestHash: 98ea885331dfd0bc57b8c5e149d4886ac238e919002551bede2e253e1737c4f0
4545
name: cluster-autoscaler.addons.k8s.io
4646
selector:
4747
k8s-addon: cluster-autoscaler.addons.k8s.io

‎tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ rules:
149149
- csinodes
150150
- csidrivers
151151
- csistoragecapacities
152+
- volumeattachments
152153
verbs:
153154
- watch
154155
- list
@@ -374,7 +375,7 @@ spec:
374375
env:
375376
- name: AWS_REGION
376377
value: us-test-1
377-
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
378+
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.4
378379
imagePullPolicy: IfNotPresent
379380
livenessProbe:
380381
failureThreshold: 3

‎tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
enabled: true
3939
expander: priority
4040
ignoreDaemonSetsUtilization: false
41-
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
41+
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.4
4242
maxNodeProvisionTime: 15m0s
4343
newPodScaleUpDelay: 0s
4444
scaleDownDelayAfterAdd: 10m0s

‎tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
version: 9.99.0
4242
- id: k8s-1.15
4343
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
44-
manifestHash: 29605e5dcd67d0676c67d06dc59a3aaf5e28ecc6a4d8682956b928664b684fd2
44+
manifestHash: 3da742fd6d5fc593b32a363cdab310cf50e41a23f4f231bb0eaab64537c9ded1
4545
name: cluster-autoscaler.addons.k8s.io
4646
selector:
4747
k8s-addon: cluster-autoscaler.addons.k8s.io

‎tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ rules:
149149
- csinodes
150150
- csidrivers
151151
- csistoragecapacities
152+
- volumeattachments
152153
verbs:
153154
- watch
154155
- list
@@ -374,7 +375,7 @@ spec:
374375
env:
375376
- name: AWS_REGION
376377
value: us-test-1
377-
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
378+
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.4
378379
imagePullPolicy: IfNotPresent
379380
livenessProbe:
380381
failureThreshold: 3

‎tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
enabled: true
3232
expander: priority
3333
ignoreDaemonSetsUtilization: false
34-
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
34+
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.4
3535
maxNodeProvisionTime: 15m0s
3636
newPodScaleUpDelay: 0s
3737
scaleDownDelayAfterAdd: 10m0s

‎tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
enabled: true
3535
expander: random
3636
ignoreDaemonSetsUtilization: false
37-
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
37+
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.4
3838
maxNodeProvisionTime: 15m0s
3939
newPodScaleUpDelay: 0s
4040
scaleDownDelayAfterAdd: 10m0s

‎tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
version: 9.99.0
4242
- id: k8s-1.15
4343
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
44-
manifestHash: dbc0df294fcd14e5e160aee8184a0a44f8f19b1405ba6e59df9bc374744cc550
44+
manifestHash: 5b15093c718da2166cdebd64b6b5075476cbd045802ad684577b0393095f5c6c
4545
name: cluster-autoscaler.addons.k8s.io
4646
selector:
4747
k8s-addon: cluster-autoscaler.addons.k8s.io

‎tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ rules:
149149
- csinodes
150150
- csidrivers
151151
- csistoragecapacities
152+
- volumeattachments
152153
verbs:
153154
- watch
154155
- list
@@ -347,7 +348,7 @@ spec:
347348
value: arn:aws-test:iam::123456789012:role/cluster-autoscaler.kube-system.sa.minimal.example.com
348349
- name: AWS_WEB_IDENTITY_TOKEN_FILE
349350
value: /var/run/secrets/amazonaws.com/token
350-
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.30.0
351+
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.4
351352
imagePullPolicy: IfNotPresent
352353
livenessProbe:
353354
failureThreshold: 3

0 commit comments

Comments
 (0)