Skip to content

Commit f658041

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17644 from hakman/bump-ccm
Update CCM for AWS, Azure and Hetzner
2 parents 24ce2fa + 30e20b9 commit f658041

File tree

216 files changed

+226
-224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+226
-224
lines changed

‎pkg/model/components/awscloudcontrollermanager.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,20 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(cluster *kops.Clu
7575
if eccm.Image == "" {
7676
// See https://us.gcr.io/k8s-artifacts-prod/provider-aws/cloud-controller-manager
7777
switch b.ControlPlaneKubernetesVersion().Minor() {
78-
case 27:
79-
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.9"
80-
case 28:
81-
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.9"
8278
case 29:
83-
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.29.6"
79+
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.29.8"
8480
case 30:
85-
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.30.3"
81+
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.30.9"
8682
case 31:
87-
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0"
83+
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.8"
84+
case 32:
85+
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5"
86+
case 33:
87+
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.33.2"
88+
case 34:
89+
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0"
8890
default:
89-
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0"
91+
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0"
9092
}
9193
}
9294

‎pkg/model/components/hetznercloudcontrollermanager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (b *HetznerCloudControllerManagerOptionsBuilder) BuildOptions(cluster *kops
5555
eccm.ConfigureCloudRoutes = fi.PtrTo(false)
5656

5757
if eccm.Image == "" {
58-
eccm.Image = "hetznercloud/hcloud-cloud-controller-manager:v1.19.0"
58+
eccm.Image = "hetznercloud/hcloud-cloud-controller-manager:v1.27.0"
5959
}
6060

6161
return nil

‎tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
env:
4343
- name: KUBERNETES_SERVICE_HOST
4444
value: 127.0.0.1
45-
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
45+
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0
4646
imagePullPolicy: IfNotPresent
4747
name: aws-cloud-controller-manager
4848
resources:

‎tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ spec:
9898
version: 9.99.0
9999
- id: k8s-1.18
100100
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
101-
manifestHash: 1d529e7285ecca27d47a4f5a3b149981ae78e9f23162aafa7046caa269bef3e5
101+
manifestHash: f43a1687d0367344f1357053c4ee1e7e9c4d1ed8342d2a591ef621e65f1b574c
102102
name: aws-cloud-controller.addons.k8s.io
103103
selector:
104104
k8s-addon: aws-cloud-controller.addons.k8s.io

‎tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
clusterCIDR: 100.96.0.0/11
1919
clusterName: additionalobjects.example.com
2020
configureCloudRoutes: false
21-
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
21+
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0
2222
leaderElection:
2323
leaderElect: true
2424
cloudProvider: aws

‎tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
clusterCIDR: 100.96.0.0/11
1919
clusterName: minimal.example.com
2020
configureCloudRoutes: false
21-
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
21+
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0
2222
leaderElection:
2323
leaderElect: true
2424
cloudProvider: aws

‎tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
env:
4343
- name: KUBERNETES_SERVICE_HOST
4444
value: 127.0.0.1
45-
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
45+
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0
4646
imagePullPolicy: IfNotPresent
4747
name: aws-cloud-controller-manager
4848
resources:

‎tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ spec:
9898
version: 9.99.0
9999
- id: k8s-1.18
100100
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
101-
manifestHash: b83675bb70a2762140f0e46d86a82f64bd545c2b582107cbac2c9ae946b6ac60
101+
manifestHash: 173838a4aa1bb0119022edb4a47dd54c5154f2054d0bb187916b3f06b7645240
102102
name: aws-cloud-controller.addons.k8s.io
103103
selector:
104104
k8s-addon: aws-cloud-controller.addons.k8s.io

‎tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
clusterCIDR: 100.96.0.0/11
2323
clusterName: minimal.example.com
2424
configureCloudRoutes: false
25-
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
25+
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
2626
leaderElection:
2727
leaderElect: true
2828
cloudProvider: aws

‎tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com
4747
- name: AWS_WEB_IDENTITY_TOKEN_FILE
4848
value: /var/run/secrets/amazonaws.com/token
49-
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
49+
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
5050
imagePullPolicy: IfNotPresent
5151
name: aws-cloud-controller-manager
5252
resources:

0 commit comments

Comments
 (0)