From 51d34987abd35231cf043df557cbaf2b1fbaa0e8 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sat, 16 Sep 2023 07:47:13 -0400 Subject: [PATCH] Update aws-ebs-csi-driver to use the new shared AWS community account Signed-off-by: Davanum Srinivas --- .../aws-ebs-csi-driver-periodics.yaml | 40 ++++++++- .../aws-ebs-csi-driver-presubmits.yaml | 86 +++++++++++++++---- 2 files changed, 107 insertions(+), 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 index 378f5605923e..1b69f9bdbb8a 100644 --- 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,5 +1,6 @@ periodics: - name: ci-aws-ebs-csi-driver-unit-test + cluster: eks-prow-build-cluster decorate: true decoration_config: timeout: 1h20m @@ -7,7 +8,7 @@ periodics: 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,12 +23,20 @@ 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 @@ -35,7 +44,7 @@ periodics: 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,12 +59,20 @@ 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 @@ -63,7 +80,7 @@ periodics: 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,12 +95,20 @@ 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 @@ -91,7 +116,7 @@ periodics: 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 index e919d90e74fb..77db41474970 100644 --- 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,6 +1,7 @@ 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: @@ -8,7 +9,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 @@ -19,12 +20,20 @@ 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: @@ -32,7 +41,7 @@ presubmits: 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,17 +110,18 @@ 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: @@ -112,7 +129,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 @@ -123,12 +140,20 @@ 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: @@ -136,7 +161,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 @@ -147,12 +172,20 @@ 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: @@ -160,7 +193,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 @@ -171,12 +204,20 @@ 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: @@ -184,7 +225,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 @@ -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