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

Merge pull request #14718 from olemarkus/ccm-126alpha 

Use AWS CCM 1.26.0-alpha.1 for k8s 1.26 clusters
This commit is contained in:
Kubernetes Prow Robot 2022-12-04 05:59:54 -08:00 committed by GitHub
parent 05f7a9e9ec d41ae73318
commit fde7f04197
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.24.1" eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.1"
case 25: case 25:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.1" eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.1"
case 26:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.26.0-alpha.1"
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/many-addons-ccm-irsa26/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.26.0-alpha.1
leaderElection: leaderElection:
leaderElect: true leaderElect: true
cloudProvider: aws cloudProvider: aws

2
tests/integration/update_cluster/many-addons-ccm-irsa26/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.26.0-alpha.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager name: aws-cloud-controller-manager
resources: resources:

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

@ -128,7 +128,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: 3f5379ffaf8418be6b271bc34a1e8ed2e4b72e971ff84129acd348ce0934884e
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.26/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.26.0-alpha.1
leaderElection: leaderElection:
leaderElect: true leaderElect: true
cloudProvider: aws cloudProvider: aws

2
tests/integration/update_cluster/minimal-1.26/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.26.0-alpha.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager name: aws-cloud-controller-manager
resources: resources:

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

@ -48,7 +48,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: ac04550cea899fb6075e474dbf0c851a7ff10f21d2bfc029a6b431eb48bf25b0
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-dns-none/data/aws_s3_object_cluster-completed.spec_content
View File

@ -21,7 +21,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.26.0-alpha.1
leaderElection: leaderElection:
leaderElect: true leaderElect: true
cloudProvider: aws cloudProvider: aws

2
tests/integration/update_cluster/minimal-dns-none/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.26.0-alpha.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager name: aws-cloud-controller-manager
resources: resources:

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

@ -41,7 +41,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: ac04550cea899fb6075e474dbf0c851a7ff10f21d2bfc029a6b431eb48bf25b0
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