Skip to content

Commit

Permalink
Merge pull request #14131 from olemarkus/automated-cherry-pick-of-#14…
Browse files Browse the repository at this point in the history
…130-origin-release-1.24

Automated cherry pick of #14130: Bump the CCM images
  • Loading branch information
k8s-ci-robot authored Aug 17, 2022
2 parents 1e09f34 + c0fb336 commit 3ad9415
Show file tree
Hide file tree
Showing 34 changed files with 37 additions and 37 deletions.
8 changes: 4 additions & 4 deletions pkg/model/components/awscloudcontrollermanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er
case 20:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.20.1"
case 21:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.0"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3"
case 22:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.22.2"
case 23:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.1"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.2"
case 24:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1"
default:
eccm.Image = "gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.24.0-27-g1477d6e"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
clusterName: complex.example.com
configureCloudRoutes: false
enableLeaderMigration: true
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
leaderElection:
leaderElect: true
cloudLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: a898fc86900a2455b2a3f424f0adbd7d96509895dd2619808623efb06b6c43a6
manifestHash: 9f48cb7f999992fbd0c3237a4a54ab57f017fd9a867145bcc652c20908cbea0d
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
clusterCIDR: 172.20.0.0/16
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 3dc5f8afaeca391ef2cfff7103af4e3ea5cb8f905af098af45eb6f1b5c03c724
manifestHash: 9c5708188af7563dc1f6b40d9e9f71ac17e77ae2f1b2a73a39802bc5c5e68c55
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
clusterCIDR: 172.20.0.0/16
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.2
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.2
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 3d10e5986df7b91bb4370438493911d538331bfe7225bc37aed2f38a4c1c9ec9
manifestHash: d14744e1d911757f2ce7cae8a9081f98d4d81a3d692e295370739b1f96c85ea3
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
clusterName: minimal.example.com
configureCloudRoutes: false
enableLeaderMigration: true
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 2184fba1fc470722507962a3092d48f53d9f3b5aae11e298248cf08f2b954938
manifestHash: a8d37b942b473463ad4b933b701ac7bf1d4941b17a677080dddf9919e2e0ebfb
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
clusterCIDR: 172.20.0.0/16
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 140a865d26bc123ed259a90e0d12aa0b644e336362d5f83fef78142b9ea65161
manifestHash: d7f58fb04e8ce9950917391fc43f59022ee18de02cf44427eb958bdf29bc5d8e
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
clusterName: minimal.example.com
configureCloudRoutes: false
enableLeaderMigration: true
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 89328b0438168219d0a66b1e61173e7ddc68d899e1f33d361ba0e7b83842b84a
manifestHash: 89dcfd1be3ddb538bb6c0c2d02b5e138471ec678e6232beb1c7f2f28447e48d8
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
clusterName: minimal-ipv6.example.com
configureCloudRoutes: false
enableLeaderMigration: true
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: f0de0a1dc002589f04dfd37c587f2ab60c37389ad8377cc4bd00ccfa178a00a6
manifestHash: 265933ef899fd13f3be8ace98bbf4a360615936f517a69156902c18f70fbd511
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
clusterCIDR: ::/0
clusterName: minimal-ipv6.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 5a63e09de5abc8e5944e44dc102c000711bdfcceedb84039b2555c9da9f9043c
manifestHash: 714ecdbe5cd22ca3160e01cb2e76c26f69cdb8248bfbca253f78485fc2058b38
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
clusterCIDR: ::/0
clusterName: minimal-ipv6.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.2
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.2
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: a4dc9ed89dd029b8f985738eba602db9d1923283823ef17dd681df31cbec1dca
manifestHash: bff705396efe554566bd2c0f5221b5cd9ef6861a3961dd8ed7f7ce058529c937
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
clusterCIDR: ::/0
clusterName: minimal-ipv6.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 5a63e09de5abc8e5944e44dc102c000711bdfcceedb84039b2555c9da9f9043c
manifestHash: 714ecdbe5cd22ca3160e01cb2e76c26f69cdb8248bfbca253f78485fc2058b38
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
clusterName: privatecalico.example.com
configureCloudRoutes: false
enableLeaderMigration: true
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: f8fd8d170f77a75cd976d77cbd9c9773e05bea0daf79d2a61486bcecd2354070
manifestHash: 690936c80d77d5da99ae49d93e9e1d2228c2784bcc22ff96b3f80c9d05d61232
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down

0 comments on commit 3ad9415

Please sign in to comment.