Merge pull request #5869 from damdo/bump-aws-ccm-and-add-variable

🌱 Bump AWS CCM to v1.32.5 and add variable for it in E2Es

Author: k8s-ci-robot

templates/cluster-template-flatcar-machinepool.yaml

@@ -252,7 +252,7 @@ data:
           serviceAccountName: cloud-controller-manager
           containers:
             - name: aws-cloud-controller-manager
-              image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.3
+              image: registry.k8s.io/provider-aws/cloud-controller-manager:${KUBERNETES_AWS_CCM_VERSION:-v1.32.5}
               args:
                 - --v=2
                 - --cloud-provider=aws

templates/cluster-template-flatcar.yaml

@@ -235,7 +235,7 @@ data:
           serviceAccountName: cloud-controller-manager
           containers:
             - name: aws-cloud-controller-manager
-              image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.3
+              image: registry.k8s.io/provider-aws/cloud-controller-manager:${KUBERNETES_AWS_CCM_VERSION:-v1.32.5}
               args:
                 - --v=2
                 - --cloud-provider=aws

templates/cluster-template-machinepool.yaml

@@ -199,7 +199,7 @@ data:
           serviceAccountName: cloud-controller-manager
           containers:
             - name: aws-cloud-controller-manager
-              image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.3
+              image: registry.k8s.io/provider-aws/cloud-controller-manager:${KUBERNETES_AWS_CCM_VERSION:-v1.32.5}
               args:
                 - --v=2
                 - --cloud-provider=aws

templates/cluster-template.yaml

@@ -182,7 +182,7 @@ data:
           serviceAccountName: cloud-controller-manager
           containers:
             - name: aws-cloud-controller-manager
-              image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.3
+              image: registry.k8s.io/provider-aws/cloud-controller-manager:${KUBERNETES_AWS_CCM_VERSION:-v1.32.5}
               args:
                 - --v=2
                 - --cloud-provider=aws

test/e2e/data/e2e_conf.yaml

@@ -190,6 +190,7 @@ variables:
   KUBERNETES_VERSION: "v1.32.0"
   KUBERNETES_VERSION_UPGRADE_TO: "v1.32.0"
   KUBERNETES_VERSION_UPGRADE_FROM: "v1.31.0"
+  KUBERNETES_AWS_CCM_VERSION: "v1.32.5"
   CNI: "../../data/cni/calico.yaml"
   KUBETEST_CONFIGURATION: "../../data/kubetest/conformance.yaml"
   EVENT_BRIDGE_INSTANCE_STATE: "true"

test/e2e/data/infrastructure-aws/withclusterclass/e2e_test_templates/cluster-template-nested-multitenancy-clusterclass.yaml

@@ -160,9 +160,12 @@ data:
           serviceAccountName: cloud-controller-manager
           containers:
             - name: aws-cloud-controller-manager
-              image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.20.0-alpha.0
+              image: registry.k8s.io/provider-aws/cloud-controller-manager:${KUBERNETES_AWS_CCM_VERSION:-v1.32.5}
               args:
                 - --v=2
+                - --cloud-provider=aws
+                - --use-service-account-credentials=true
+                - --configure-cloud-routes=false
               resources:
                 requests:
                   cpu: 200m
@@ -238,6 +241,9 @@ data:
           - serviceaccounts
         verbs:
           - create
+          - get
+          - list
+          - watch
       - apiGroups:
           - ""
         resources:
@@ -274,6 +280,12 @@ data:
           - list
           - watch
           - update
+      - apiGroups:
+          - ""
+        resources:
+          - serviceaccounts/token
+        verbs:
+          - create
     ---
     kind: ClusterRoleBinding
     apiVersion: rbac.authorization.k8s.io/v1

test/e2e/data/infrastructure-aws/withclusterclass/e2e_test_templates/cluster-template-self-hosted-clusterclass.yaml

@@ -135,9 +135,12 @@ data:
           serviceAccountName: cloud-controller-manager
           containers:
             - name: aws-cloud-controller-manager
-              image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.20.0-alpha.0
+              image: registry.k8s.io/provider-aws/cloud-controller-manager:${KUBERNETES_AWS_CCM_VERSION:-v1.32.5}
               args:
                 - --v=2
+                - --cloud-provider=aws
+                - --use-service-account-credentials=true
+                - --configure-cloud-routes=false
               resources:
                 requests:
                   cpu: 200m
@@ -213,6 +216,9 @@ data:
           - serviceaccounts
         verbs:
           - create
+          - get
+          - list
+          - watch
       - apiGroups:
           - ""
         resources:
@@ -249,6 +255,12 @@ data:
           - list
           - watch
           - update
+      - apiGroups:
+          - ""
+        resources:
+          - serviceaccounts/token
+        verbs:
+          - create
     ---
     kind: ClusterRoleBinding
     apiVersion: rbac.authorization.k8s.io/v1

test/e2e/data/infrastructure-aws/withclusterclass/e2e_test_templates/cluster-template-topology.yaml

@@ -131,9 +131,12 @@ data:
           serviceAccountName: cloud-controller-manager
           containers:
             - name: aws-cloud-controller-manager
-              image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.20.0-alpha.0
+              image: registry.k8s.io/provider-aws/cloud-controller-manager:${KUBERNETES_AWS_CCM_VERSION:-v1.32.5}
               args:
                 - --v=2
+                - --cloud-provider=aws
+                - --use-service-account-credentials=true
+                - --configure-cloud-routes=false
               resources:
                 requests:
                   cpu: 200m
@@ -209,6 +212,9 @@ data:
           - serviceaccounts
         verbs:
           - create
+          - get
+          - list
+          - watch
       - apiGroups:
           - ""
         resources:
@@ -245,6 +251,12 @@ data:
           - list
           - watch
           - update
+      - apiGroups:
+          - ""
+        resources:
+          - serviceaccounts/token
+        verbs:
+          - create
     ---
     kind: ClusterRoleBinding
     apiVersion: rbac.authorization.k8s.io/v1

test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-efs-support.yaml

@@ -215,9 +215,12 @@ data:
           serviceAccountName: cloud-controller-manager
           containers:
             - name: aws-cloud-controller-manager
-              image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.20.0-alpha.0
+              image: registry.k8s.io/provider-aws/cloud-controller-manager:${KUBERNETES_AWS_CCM_VERSION:-v1.32.5}
               args:
                 - --v=2
+                - --cloud-provider=aws
+                - --use-service-account-credentials=true
+                - --configure-cloud-routes=false
               resources:
                 requests:
                   cpu: 200m
@@ -293,6 +296,9 @@ data:
           - serviceaccounts
         verbs:
           - create
+          - get
+          - list
+          - watch
       - apiGroups:
           - ""
         resources:
@@ -329,6 +335,12 @@ data:
           - list
           - watch
           - update
+      - apiGroups:
+          - ""
+        resources:
+          - serviceaccounts/token
+        verbs:
+          - create
     ---
     kind: ClusterRoleBinding
     apiVersion: rbac.authorization.k8s.io/v1

test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-external-cloud-provider.yaml

@@ -208,9 +208,12 @@ data:
           serviceAccountName: cloud-controller-manager
           containers:
             - name: aws-cloud-controller-manager
-              image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.20.0-alpha.0
+              image: registry.k8s.io/provider-aws/cloud-controller-manager:${KUBERNETES_AWS_CCM_VERSION:-v1.32.5}
               args:
                 - --v=2
+                - --cloud-provider=aws
+                - --use-service-account-credentials=true
+                - --configure-cloud-routes=false
               resources:
                 requests:
                   cpu: 200m
@@ -286,6 +289,9 @@ data:
           - serviceaccounts
         verbs:
           - create
+          - get
+          - list
+          - watch
       - apiGroups:
           - ""
         resources:
@@ -322,6 +328,12 @@ data:
           - list
           - watch
           - update
+      - apiGroups:
+          - ""
+        resources:
+          - serviceaccounts/token
+        verbs:
+          - create
     ---
     kind: ClusterRoleBinding
     apiVersion: rbac.authorization.k8s.io/v1