Skip to content

Commit

Permalink
Merge pull request #16524 from hakman/aws_ccm_1.28.5
Browse files Browse the repository at this point in the history
aws: Update CCM to v1.28.5
  • Loading branch information
k8s-ci-robot authored May 5, 2024
2 parents 7d72d30 + cfed50c commit 6718f8f
Show file tree
Hide file tree
Showing 208 changed files with 214 additions and 214 deletions.
14 changes: 7 additions & 7 deletions pkg/model/components/awscloudcontrollermanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,19 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er
// See https://us.gcr.io/k8s-artifacts-prod/provider-aws/cloud-controller-manager
switch b.KubernetesVersion.Minor {
case 23:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.17"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.20"
case 24:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.15"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.19"
case 25:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.3"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.15"
case 26:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11"
case 27:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.2"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.6"
case 28:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.1"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.5"
default:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.1"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.5"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.2
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.6
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.27.2
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.6
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 0ff974e13ec519948db39a69d054f65ce4404b17b19206e7e7fcf28de958d80c
manifestHash: 2ab4b2bb0bc3a366a193a0041303f726d07858b24bb0ff537baf0f8114c16699
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 @@ -23,7 +23,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
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.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: f8cc45fc5a0b2201f2811e4b21c9a4237a322fc2cf14c5322c9aeae061897cc1
manifestHash: bde9fd03eb9b0c17659bba7e5c67e82bb9cbed0bca05a643983ba715ed03b444
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 @@ -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.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: f6b072cfa1a9134ca0106e856b2a70b2f0dca749991583de4cd3f87ccc7dccd3
manifestHash: 3ac50f6866f24360d5c4025f5234e7a88c02473c81e829d633d64998f68f3979
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 @@ -21,7 +21,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: bastionuserdata.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
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.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 399257cb8c9aa2d7401eb4e3e12aede61a31d40434718f61dec8763854b01857
manifestHash: de180cda7c71abce0e61b5d298e9a6119d350aac3ea7ebb492af6368670529b7
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:
clusterCIDR: 100.96.0.0/11
clusterName: cas-priority-expander-custom.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
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.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 645e8940c7771bdf712ce127b84e68baa44097cffc8f905ac42bb2d1e284c0b5
manifestHash: b7cbf71d50931a221ef47d6f76cc43a80625fca8875b6c4d95f4cdcd8a2fd6d2
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:
clusterCIDR: 100.96.0.0/11
clusterName: cas-priority-expander.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
leaderElection:
leaderElect: true
cloudProvider: aws
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.15
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.19
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.15
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.19
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 9f2124a3cd64512b87897b80a3e8eea5bd3bff91ff77102394b1fdcb86c98686
manifestHash: a297f63bd0ea477f4bec374fa7d7d588edea5464fa943bc4bf9b35b504d91b1c
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 @@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: compress.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
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.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 3cacb886dcc54c79396c05b19c3fe7c66842571156a3dda71e6f28a2b5d66bb9
manifestHash: 375350889c407b4221eb0c721905a49ee7154724c5d05036be3d015c7f1027b6
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 @@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: containerd.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
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.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 48e0169d461e7b741442985ca61df93aee9f678a5072c350ffee2226ea22aa6c
manifestHash: 38c9b818d85f536183ff96f9f9f080b0443095f3adb5ab75547975b6b3da7e59
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 @@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: containerd.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
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.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 48e0169d461e7b741442985ca61df93aee9f678a5072c350ffee2226ea22aa6c
manifestHash: 38c9b818d85f536183ff96f9f9f080b0443095f3adb5ab75547975b6b3da7e59
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 @@ -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.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 423d0e938aaa568717523a529e3dada7d2c5d4b43dbea36266bdf658991fd9b1
manifestHash: 1d491a2b3ff1c71306b4fe54a5921f49074fe8653b879b4eadbb07e05ad0166d
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 @@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: 123.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: existing-iam.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
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.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 90172ec59c913aec647fd51bc2341c6d74ba74656655978e2e66982ed4d22cec
manifestHash: cd33b2f51177cae10ebd9dd1eae143905c6288d339dbc4e9efd95004e8ac09dd
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:
clusterCIDR: 100.96.0.0/11
clusterName: existingsg.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
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.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 0c3538b4938e12f7f63ee5da668ba2ae8789e10b067a52b44cd0f85bccc35ae6
manifestHash: 383c5730dac02bbc885a295c56061538a8c15e6c7404e57b460863771bad220a
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 @@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
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.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
version: 9.99.0
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: eff0c442541bc156d4c1d3e1632794c90f1c31e92a88f129d4b0e30baf7bc920
manifestHash: 0579c35877bca01249f9682e09bc387e32e01734790ae7f61f1ec271b5bf9a26
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 @@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
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.26.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.11
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Loading

0 comments on commit 6718f8f

Please sign in to comment.