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

Merge pull request #12291 from hakman/aws-ccm-1.22.0-alpha.0 

Default to latest staging image for AWS CCM
This commit is contained in:
Kubernetes Prow Robot 2021-09-12 06:26:07 -07:00 committed by GitHub
parent 2645e8410a cf8b11b0d4
commit 2e3ca721a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,22 +74,21 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er
} }
if eccm.Image == "" { if eccm.Image == "" {
var tag string // See https://us.gcr.io/k8s-artifacts-prod/provider-aws/cloud-controller-manager
switch b.KubernetesVersion.Minor { switch b.KubernetesVersion.Minor {
case 18: case 18:
tag = "v1.18.0-alpha.1" eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.18.0-alpha.1"
case 19: case 19:
tag = "v1.19.0-alpha.1" eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.19.0-alpha.1"
case 20: case 20:
tag = "v1.20.0-alpha.0" eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.20.0-alpha.0"
case 21: case 21:
tag = "v1.21.0-alpha.0" eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0"
case 22:
eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.22.0-alpha.0"
default: default:
// There is no latest tag, so default to the latest that exists eccm.Image = "gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest"
// See https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/us/provider-aws/cloud-controller-manager
tag = "v1.22.0-alpha.0"
} }
eccm.Image = fmt.Sprintf("k8s.gcr.io/provider-aws/cloud-controller-manager:%v", tag)
} }
return nil return nil