Add AWS CCM v1.21.0 tag

kubernetes · Aug 5, 2021 · d38e05a · d38e05a
1 parent d138636
commit d38e05a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go
@@ -656,8 +656,10 @@ func (tf *TemplateFunctions) AWSCCMTag() (string, error) {
 	switch parsed.Minor {
 	case 18:
 		tag = "v1.18.0-alpha.1"
-	case 19:
+	case 19, 20:
 		tag = "v1.19.0-alpha.1"
+	case 21:
+		tag = "v20210510-v1.21.0-alpha.0"
 	default:
 		tag = "latest"
 	}

diff --git a/...otstrapchannelbuilder/awscloudcontroller/aws-cloud-controller.addons.k8s.io-k8s-1.18.yaml b/...otstrapchannelbuilder/awscloudcontroller/aws-cloud-controller.addons.k8s.io-k8s-1.18.yaml
@@ -30,7 +30,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest
+        image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.19.0-alpha.1
         imagePullPolicy: IfNotPresent
         name: aws-cloud-controller-manager
         resources:

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
@@ -47,7 +47,7 @@ spec:
       k8s-addon: storage-aws.addons.k8s.io
   - id: k8s-1.18
     manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
-    manifestHash: c2b208761561c8596a3cb60ada550760756f85d1973a55510ce0df044c0f680d
+    manifestHash: dae6de6f1497a973afa6b1b13e38b91e6ab64c6226c0d930a35aa0abc35a4c95
     name: aws-cloud-controller.addons.k8s.io
     selector:
       k8s-addon: aws-cloud-controller.addons.k8s.io