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

Bump CCM 1.22 image. Use the 1.23 image for 1.24 due to latest being broken

This commit is contained in:
Ole Markus With 2022-03-11 08:12:52 +01:00
parent b51a7ee45d
commit 8524c3d320
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,9 +94,11 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er
case 21: case 21:
eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0" eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0"
case 22: case 22:
eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.22.0-alpha.1" eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.22.0-alpha.2"
case 23: case 23:
eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0" eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0"
case 24:
eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0"
default: default:
eccm.Image = "gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest" eccm.Image = "gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest"
} }

2
tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -20,7 +20,7 @@ spec:
clusterName: minimal.example.com clusterName: minimal.example.com
configureCloudRoutes: false configureCloudRoutes: false
enableLeaderMigration: true enableLeaderMigration: true
image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0
leaderElection: leaderElection:
leaderElect: true leaderElect: true
cloudProvider: aws cloudProvider: aws

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

@ -35,7 +35,7 @@ spec:
env: env:
- name: KUBERNETES_SERVICE_HOST - name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1 value: 127.0.0.1
image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager name: aws-cloud-controller-manager
resources: resources:

2
tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content
View File

@ -61,7 +61,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: 6ce20f3da58bc0e8ae3846539c315e48a7e6112073e6c54965d6df631231e961 manifestHash: a5eb17fbc815956fcb04cedb06f79b11fd0677b607e753ec48040af5b74e408b
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