Sitelet https://github.com/kubernetes/kops/commit/9d238ba7554e496d16924189195f9ec0e7657d79
Skip to content

Commit 9d238ba

Browse files
authored
Merge pull request #18218 from hakman/automated-cherry-pick-of-#18110-upstream-release-1.34
Automated cherry pick of #18110: Update Cluster Autoscaler to 1.35.0
2 parents 7f31a99 + 289dff7 commit 9d238ba

19 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎pkg/model/components/clusterautoscaler.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o *kops.Cluster) error {
5050
case 31:
5151
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.31.5"
5252
case 32:
53-
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.4"
53+
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.7"
5454
case 33:
55-
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.33.2"
55+
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.33.4"
5656
case 34:
57-
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.34.1"
57+
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.34.3"
5858
default:
59-
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.34.1"
59+
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.35.0"
6060
}
6161
}
6262
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
@@ -40,7 +40,7 @@ spec:
4040
version: 9.99.0
4141
- id: k8s-1.15
4242
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
43-
manifestHash: 5691088ab49d3a07d67faaab475bb63c2f793eaba83943cd71a2fd59d4515626
43+
manifestHash: bdf9835482d45714cb5956eebe65e5379ac02287a87452319e4521eb8f6e2274
4444
name: cluster-autoscaler.addons.k8s.io
4545
selector:
4646
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ spec:
365365
env:
366366
- name: AWS_REGION
367367
value: us-test-1
368-
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.4
368+
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.7
369369
imagePullPolicy: IfNotPresent
370370
livenessProbe:
371371
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.32.4
41+
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.7
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
@@ -40,7 +40,7 @@ spec:
4040
version: 9.99.0
4141
- id: k8s-1.15
4242
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
43-
manifestHash: b9b8c15ff0323c3e3c1975ddb0b09936b7d885e118d12851f6ee85a34e81fe26
43+
manifestHash: e0c88cf0dcd2f9c28c92102572cb4cd35427a8e417da796a56629ea2c10335e5
4444
name: cluster-autoscaler.addons.k8s.io
4545
selector:
4646
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ spec:
365365
env:
366366
- name: AWS_REGION
367367
value: us-test-1
368-
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.4
368+
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.7
369369
imagePullPolicy: IfNotPresent
370370
livenessProbe:
371371
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.32.4
34+
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.7
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
@@ -38,7 +38,7 @@ spec:
3838
enabled: true
3939
expander: random
4040
ignoreDaemonSetsUtilization: false
41-
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.4
41+
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.7
4242
maxNodeProvisionTime: 15m0s
4343
newPodScaleUpDelay: 0s
4444
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
@@ -40,7 +40,7 @@ spec:
4040
version: 9.99.0
4141
- id: k8s-1.15
4242
manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml
43-
manifestHash: 8c5912d44dcd25d8ffc9164bd2c3bcc981be1f974cb5a4599d44bfa51e94809d
43+
manifestHash: 80c60c8e636d4a920cb61c55c29046eb4c896a7c923d41fd9b8b35e8e3465d52
4444
name: cluster-autoscaler.addons.k8s.io
4545
selector:
4646
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ spec:
339339
value: arn:aws-test:iam::123456789012:role/cluster-autoscaler.kube-system.sa.minimal.example.com
340340
- name: AWS_WEB_IDENTITY_TOKEN_FILE
341341
value: /var/run/secrets/amazonaws.com/token
342-
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.4
342+
image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.32.7
343343
imagePullPolicy: IfNotPresent
344344
livenessProbe:
345345
failureThreshold: 3

0 commit comments

Comments
 (0)