Merge pull request #30729 from dims/update-aws-ebs-csi-driver-to-use-…

…the-new-shared-aws-community-account Update aws-ebs-csi-driver to use the new shared AWS community account
kubernetes · Sep 16, 2023 · dd5cefa · dd5cefa
2 parents 506a5f2 + 51d3498
commit dd5cefa
Show file tree

Hide file tree

Showing 2 changed files with 107 additions and 19 deletions.
diff --git a/config/jobs/kubernetes-sigs/aws-ebs-csi-driver/aws-ebs-csi-driver-periodics.yaml b/config/jobs/kubernetes-sigs/aws-ebs-csi-driver/aws-ebs-csi-driver-periodics.yaml
@@ -1,13 +1,14 @@
 periodics:
 - name: ci-aws-ebs-csi-driver-unit-test
+  cluster: eks-prow-build-cluster
   decorate: true
   decoration_config:
     timeout: 1h20m
   interval: 6h
   labels:
     preset-service-account: "true"
     preset-dind-enabled: "true"
-    preset-aws-credential-aws-oss-testing: "true"
+    preset-aws-credential-aws-shared-testing: "true"
   extra_refs:
   - org: kubernetes-sigs
     repo: aws-ebs-csi-driver
@@ -22,20 +23,28 @@ periodics:
       - test
       securityContext:
         privileged: true
+      resources:
+        limits:
+          cpu: "2"
+          memory: "4Gi"
+        requests:
+          cpu: "2"
+          memory: "4Gi"
   annotations:
     testgrid-dashboards: provider-aws-ebs-csi-driver
     testgrid-tab-name: ci-unit-test
     description: aws ebs csi driver unit test, continuous
     testgrid-num-columns-recent: '30'
 - name: ci-aws-ebs-csi-driver-e2e-single-az
+  cluster: eks-prow-build-cluster
   decorate: true
   decoration_config:
     timeout: 1h20m
   interval: 6h
   labels:
     preset-service-account: "true"
     preset-dind-enabled: "true"
-    preset-aws-credential-aws-oss-testing: "true"
+    preset-aws-credential-aws-shared-testing: "true"
   extra_refs:
   - org: kubernetes-sigs
     repo: aws-ebs-csi-driver
@@ -50,20 +59,28 @@ periodics:
       - test-e2e-single-az
       securityContext:
         privileged: true
+      resources:
+        limits:
+          cpu: "2"
+          memory: "4Gi"
+        requests:
+          cpu: "2"
+          memory: "4Gi"
   annotations:
     testgrid-dashboards: provider-aws-ebs-csi-driver
     testgrid-tab-name: ci-e2e-test-single-az
     description: aws ebs csi driver e2e test on single az, continuous
     testgrid-num-columns-recent: '30'
 - name: ci-aws-ebs-csi-driver-e2e-multi-az
+  cluster: eks-prow-build-cluster
   decorate: true
   decoration_config:
     timeout: 1h20m
   interval: 6h
   labels:
     preset-service-account: "true"
     preset-dind-enabled: "true"
-    preset-aws-credential-aws-oss-testing: "true"
+    preset-aws-credential-aws-shared-testing: "true"
   extra_refs:
   - org: kubernetes-sigs
     repo: aws-ebs-csi-driver
@@ -78,20 +95,28 @@ periodics:
       - test-e2e-multi-az
       securityContext:
         privileged: true
+      resources:
+        limits:
+          cpu: "2"
+          memory: "4Gi"
+        requests:
+          cpu: "2"
+          memory: "4Gi"
   annotations:
     testgrid-dashboards: provider-aws-ebs-csi-driver
     testgrid-tab-name: ci-e2e-test-multi-az
     description: aws ebs csi driver e2e test on mutiple AZs, continuous
     testgrid-num-columns-recent: '30'
 - name: ci-aws-ebs-csi-driver-external-test
+  cluster: eks-prow-build-cluster
   decorate: true
   decoration_config:
     timeout: 1h20m
   interval: 6h
   labels:
     preset-service-account: "true"
     preset-dind-enabled: "true"
-    preset-aws-credential-aws-oss-testing: "true"
+    preset-aws-credential-aws-shared-testing: "true"
   extra_refs:
   - org: kubernetes-sigs
     repo: aws-ebs-csi-driver
@@ -106,6 +131,13 @@ periodics:
       - test-e2e-external
       securityContext:
         privileged: true
+      resources:
+        limits:
+          cpu: "2"
+          memory: "4Gi"
+        requests:
+          cpu: "2"
+          memory: "4Gi"
   annotations:
     testgrid-dashboards: provider-aws-ebs-csi-driver
     testgrid-tab-name: ci-external-test

diff --git a/config/jobs/kubernetes-sigs/aws-ebs-csi-driver/aws-ebs-csi-driver-presubmits.yaml b/config/jobs/kubernetes-sigs/aws-ebs-csi-driver/aws-ebs-csi-driver-presubmits.yaml
@@ -1,14 +1,15 @@
 presubmits:
   kubernetes-sigs/aws-ebs-csi-driver:
   - name: pull-aws-ebs-csi-driver-test-e2e-external-eks-windows
+    cluster: eks-prow-build-cluster
     always_run: true
     decorate: true
     skip_branches:
     - gh-pages
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
-      preset-aws-credential-aws-oss-testing: "true"
+      preset-aws-credential-aws-shared-testing: "true"
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230727-ea685f8747-master
@@ -19,20 +20,28 @@ presubmits:
         - test-e2e-external-eks-windows
         securityContext:
           privileged: true
+        resources:
+          limits:
+            cpu: "2"
+            memory: "4Gi"
+          requests:
+            cpu: "2"
+            memory: "4Gi"
     annotations:
       testgrid-dashboards: provider-aws-ebs-csi-driver
       testgrid-tab-name: test-e2e-external-eks-windows
       description: aws ebs csi driver External Storage tests for Windows on pull request
       testgrid-num-columns-recent: '30'
   - name: pull-aws-ebs-csi-driver-test-helm-chart
+    cluster: eks-prow-build-cluster
     always_run: true
     decorate: true
     skip_branches:
     - gh-pages
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
-      preset-aws-credential-aws-oss-testing: "true"
+      preset-aws-credential-shared-oss-testing: "true"
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230727-ea685f8747-master
@@ -43,6 +52,13 @@ presubmits:
         - test-helm-chart
         securityContext:
           privileged: true
+        resources:
+          limits:
+            cpu: "2"
+            memory: "4Gi"
+          requests:
+            cpu: "2"
+            memory: "4Gi"
     annotations:
       testgrid-dashboards: provider-aws-ebs-csi-driver
       testgrid-tab-name: test-helm-chart
@@ -66,11 +82,11 @@ presubmits:
         - verify
         resources:
           requests:
-            cpu: 2
-            memory: 4Gi
+            cpu: "2"
+            memory: "4Gi"
           limits:
-            cpu: 2
-            memory: 4Gi
+            cpu: "2"
+            memory: "4Gi"
     annotations:
       testgrid-dashboards: provider-aws-ebs-csi-driver
       testgrid-tab-name: verify
@@ -94,25 +110,26 @@ presubmits:
         - test
         resources:
           requests:
-            cpu: 2
-            memory: 4Gi
+            cpu: "2"
+            memory: "4Gi"
           limits:
-            cpu: 2
-            memory: 4Gi
+            cpu: "2"
+            memory: "4Gi"
     annotations:
       testgrid-dashboards: provider-aws-ebs-csi-driver
       testgrid-tab-name: pull-unit-test
       description: aws ebs csi driver unit test on pull request
       testgrid-num-columns-recent: '30'
   - name: pull-aws-ebs-csi-driver-e2e-single-az
+    cluster: eks-prow-build-cluster
     always_run: true
     decorate: true
     skip_branches:
     - gh-pages
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
-      preset-aws-credential-aws-oss-testing: "true"
+      preset-aws-credential-aws-shared-testing: "true"
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230727-ea685f8747-master
@@ -123,20 +140,28 @@ presubmits:
         - test-e2e-single-az
         securityContext:
           privileged: true
+        resources:
+          limits:
+            cpu: "2"
+            memory: "4Gi"
+          requests:
+            cpu: "2"
+            memory: "4Gi"
     annotations:
       testgrid-dashboards: provider-aws-ebs-csi-driver
       testgrid-tab-name: pull-e2e-test-single-az
       description: aws ebs csi driver e2e test on single az on pull request
       testgrid-num-columns-recent: '30'
   - name: pull-aws-ebs-csi-driver-e2e-multi-az
+    cluster: eks-prow-build-cluster
     always_run: true
     decorate: true
     skip_branches:
     - gh-pages
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
-      preset-aws-credential-aws-oss-testing: "true"
+      preset-aws-credential-aws-shared-testing: "true"
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230727-ea685f8747-master
@@ -147,20 +172,28 @@ presubmits:
         - test-e2e-multi-az
         securityContext:
           privileged: true
+        resources:
+          limits:
+            cpu: "2"
+            memory: "4Gi"
+          requests:
+            cpu: "2"
+            memory: "4Gi"
     annotations:
       testgrid-dashboards: provider-aws-ebs-csi-driver
       testgrid-tab-name: pull-e2e-test-multi-az
       description: aws ebs csi driver e2e test on mutiple AZs on pull request
       testgrid-num-columns-recent: '30'
   - name: pull-aws-ebs-csi-driver-external-test
+    cluster: eks-prow-build-cluster
     always_run: true
     decorate: true
     skip_branches:
       - gh-pages
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
-      preset-aws-credential-aws-oss-testing: "true"
+      preset-aws-credential-aws-shared-testing: "true"
     spec:
       containers:
         - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230727-ea685f8747-master
@@ -171,20 +204,28 @@ presubmits:
             - test-e2e-external
           securityContext:
             privileged: true
+          resources:
+            limits:
+              cpu: "2"
+              memory: "4Gi"
+            requests:
+              cpu: "2"
+              memory: "4Gi"
     annotations:
       testgrid-dashboards: provider-aws-ebs-csi-driver
       testgrid-tab-name: pull-external-test
       description: kubernetes/kubernetes external test on pull request
       testgrid-num-columns-recent: '30'
   - name: pull-aws-ebs-csi-driver-external-test-eks
+    cluster: eks-prow-build-cluster
     always_run: true
     decorate: true
     skip_branches:
       - gh-pages
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
-      preset-aws-credential-aws-oss-testing: "true"
+      preset-aws-credential-aws-shared-testing: "true"
     spec:
       containers:
         - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230727-ea685f8747-master
@@ -195,12 +236,20 @@ presubmits:
             - test-e2e-external-eks
           securityContext:
             privileged: true
+          resources:
+            limits:
+              cpu: "2"
+              memory: "4Gi"
+            requests:
+              cpu: "2"
+              memory: "4Gi"
     annotations:
       testgrid-dashboards: provider-aws-ebs-csi-driver
       testgrid-tab-name: pull-external-test-eks
       description: kubernetes/kubernetes external test on pull request on eks
       testgrid-num-columns-recent: '30'
   - name: pull-aws-ebs-csi-driver-external-test-kustomize
+    cluster: eks-prow-build-cluster
     always_run: true
     optional: true
     decorate: true
@@ -209,7 +258,7 @@ presubmits:
     labels:
       preset-service-account: "true"
       preset-dind-enabled: "true"
-      preset-aws-credential-aws-oss-testing: "true"
+      preset-aws-credential-aws-shared-testing: "true"
     spec:
       containers:
         - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230727-ea685f8747-master
@@ -220,6 +269,13 @@ presubmits:
             - test-e2e-external-kustomize
           securityContext:
             privileged: true
+          resources:
+            limits:
+              cpu: "2"
+              memory: "4Gi"
+            requests:
+              cpu: "2"
+              memory: "4Gi"
     annotations:
       testgrid-dashboards: provider-aws-ebs-csi-driver
       testgrid-tab-name: pull-external-test-kustomize