kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14207 from olemarkus/ccm-v125 

Bumping AWS CCM to 1.25
This commit is contained in:
Kubernetes Prow Robot 2022-08-31 02:57:00 -07:00 committed by GitHub
parent bab48f6083 24a5046cee
commit f4144b434e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/model/components/awscloudcontrollermanager.go
View File

@ -97,6 +97,8 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.2" eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.2"
case 24: case 24:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1" eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1"
case 25:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.0"
default: default:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1" eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1"
} }

2
tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content
View File

@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.64.0.0/10 clusterCIDR: 100.64.0.0/10
clusterName: minimal.example.com clusterName: minimal.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1 image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
cloudProvider: aws cloudProvider: aws

2
tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content
View File

@ -48,7 +48,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE - name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token value: /var/run/secrets/amazonaws.com/token
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1 image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager name: aws-cloud-controller-manager
resources: resources:

2
tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -55,7 +55,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.18 - id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 95b07c1842cf1050aa3ba57d864dbd4bc15f2bdd58a120955e34dfc7f8e3f03a manifestHash: f87cf8aae411d5d07899144476f0e20f7b3341aaef0eaadfa2895a0b553096f8
name: aws-cloud-controller.addons.k8s.io name: aws-cloud-controller.addons.k8s.io
selector: selector:
k8s-addon: aws-cloud-controller.addons.k8s.io k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content
View File

@ -24,7 +24,7 @@ spec:
clusterCIDR: 172.20.0.0/16 clusterCIDR: 172.20.0.0/16
clusterName: minimal.example.com clusterName: minimal.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1 image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
cloudProvider: aws cloudProvider: aws

2
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content
View File

@ -48,7 +48,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE - name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token value: /var/run/secrets/amazonaws.com/token
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1 image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager name: aws-cloud-controller-manager
resources: resources:

2
tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -127,7 +127,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.18 - id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 86e783fd16966b5a1fc23d08fc549b69d4b1b4a6781678ac0b4bb45e7a9f65e6 manifestHash: 8a1cb251b05705501c5c5adde70f20c677fc5d1a43da3de5cf6d87171bd991b1
name: aws-cloud-controller.addons.k8s.io name: aws-cloud-controller.addons.k8s.io
selector: selector:
k8s-addon: aws-cloud-controller.addons.k8s.io k8s-addon: aws-cloud-controller.addons.k8s.io

2
tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content
View File

@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.64.0.0/10 clusterCIDR: 100.64.0.0/10
clusterName: minimal.example.com clusterName: minimal.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1 image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
cloudProvider: aws cloudProvider: aws

2
tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-aws-cloud-controller.addons.k8s.io-k8s-1.18_content
View File

@ -44,7 +44,7 @@ spec:
env: env:
- name: KUBERNETES_SERVICE_HOST - name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1 value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1 image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager name: aws-cloud-controller-manager
resources: resources:

2
tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -55,7 +55,7 @@ spec:
version: 9.99.0 version: 9.99.0
- id: k8s-1.18 - id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: cb2f0370e6222f9bed4ca18534644df284521524dd922059f019b06f4c218996 manifestHash: 7bc69a077859866875d70015364a34c858547bd005885ad1d3eebc701945ba85
name: aws-cloud-controller.addons.k8s.io name: aws-cloud-controller.addons.k8s.io
selector: selector:
k8s-addon: aws-cloud-controller.addons.k8s.io k8s-addon: aws-cloud-controller.addons.k8s.io