Merge pull request #33119 from aramase/aramase/ci/secrets_store_prow_…

…migration_azure_final secrets-store: move all azure jobs to eks prow cluster
kubernetes · Jul 26, 2024 · b844f0e · b844f0e
2 parents 1e1b596 + 551d3f1
commit b844f0e
Showing 1 changed file with 25 additions and 107 deletions.
diff --git a/config/jobs/kubernetes-sigs/secrets-store-csi-driver/secrets-store-csi-driver-config.yaml b/config/jobs/kubernetes-sigs/secrets-store-csi-driver/secrets-store-csi-driver-config.yaml
@@ -177,6 +177,7 @@ presubmits:
       description: "Run e2e test with vault provider for Secrets Store CSI driver."
       testgrid-num-columns-recent: '30'
   - name: pull-secrets-store-csi-driver-e2e-azure
+    cluster: eks-prow-build-cluster
     decorate: true
     decoration_config:
       timeout: 25m
@@ -186,12 +187,8 @@ presubmits:
     - ^main$
     - ^release-*
     labels:
-      # this is required because we want to run kind in docker
       preset-dind-enabled: "true"
-      # this is required to make CNI installation to succeed for kind
-      preset-kind-volume-mounts: "true"
-      # sets up the azure keyvault parameters used for testing
-      preset-azure-secrets-store-creds: "true"
+      preset-azure-community: "true"
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-master
@@ -201,13 +198,16 @@ presubmits:
           - bash
           - -c
           - >-
-            make e2e-bootstrap e2e-helm-deploy e2e-azure
+            ./test/scripts/run-e2e-azure.sh
         securityContext:
           privileged: true
         resources:
           requests:
             cpu: "4"
-            memory: "4Gi"
+            memory: "6Gi"
+          limits:
+            cpu: "4"
+            memory: "6Gi"
     annotations:
       testgrid-dashboards: sig-auth-secrets-store-csi-driver, sig-auth-secrets-store-csi-driver-presubmit
       testgrid-tab-name: pr-secrets-store-csi-driver-e2e-azure
@@ -620,6 +620,7 @@ presubmits:
       description: "Run e2e test with conjur provider for Secrets Store CSI driver."
       testgrid-num-columns-recent: '30'
   - name: pull-secrets-store-csi-driver-e2e-windows
+    cluster: eks-prow-build-cluster
     decorate: true
     decoration_config:
       timeout: 90m
@@ -629,47 +630,6 @@ presubmits:
     branches:
     - ^main$
     - ^release-*
-    labels:
-      preset-azure-cred: "true"
-      preset-k8s-ssh: "true"
-      preset-dind-enabled: "true"
-      preset-azure-secrets-store-creds: "true"
-    spec:
-      containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-master
-        command:
-          - runner.sh
-        args:
-          - bash
-          - -c
-          - >-
-            ./test/scripts/run-e2e-windows.sh
-        securityContext:
-          privileged: true
-        resources:
-          requests:
-            cpu: "4"
-            memory: "4Gi"
-        env:
-          - name: TEST_WINDOWS
-            value: "true"
-    annotations:
-      testgrid-dashboards: sig-auth-secrets-store-csi-driver, sig-auth-secrets-store-csi-driver-presubmit
-      testgrid-tab-name: pr-secrets-store-csi-driver-e2e-windows
-      description: "Run E2E tests on a AKS Windows cluster for Secrets Store CSI driver."
-      testgrid-num-columns-recent: '30'
-  # TODO(aramase): remove this job once the migration is complete
-  - name: pull-secrets-store-csi-driver-e2e-windows-prow-migration-test
-    cluster: eks-prow-build-cluster
-    decorate: true
-    decoration_config:
-      timeout: 90m
-    always_run: false
-    path_alias: sigs.k8s.io/secrets-store-csi-driver
-    optional: true
-    branches:
-    - ^main$
-    - ^release-*
     labels:
       preset-azure-community: "true"
       preset-k8s-ssh: "true"
@@ -683,7 +643,7 @@ presubmits:
           - bash
           - -c
           - >-
-            ./test/scripts/run-e2e-windows.sh
+            ./test/scripts/run-e2e-azure.sh
         securityContext:
           privileged: true
         resources:
@@ -698,51 +658,8 @@ presubmits:
             value: "true"
     annotations:
       testgrid-dashboards: sig-auth-secrets-store-csi-driver, sig-auth-secrets-store-csi-driver-presubmit
-      testgrid-tab-name: pr-secrets-store-csi-driver-e2e-windows-prow-migration-test
-      description: "Run E2E tests on a AKS Windows cluster for Secrets Store CSI driver. This job is used for testing the migration to eks-prow-build-cluster."
-      testgrid-num-columns-recent: '30'
-  # TODO(aramase): remove this job once the migration is complete
-  - name: pull-secrets-store-csi-driver-e2e-azure-prow-migration-test
-    cluster: eks-prow-build-cluster
-    decorate: true
-    decoration_config:
-      timeout: 25m
-    always_run: false
-    optional: true
-    path_alias: sigs.k8s.io/secrets-store-csi-driver
-    branches:
-    - ^main$
-    - ^release-*
-    labels:
-      # this is required because we want to run kind in docker
-      preset-dind-enabled: "true"
-      # this is required to make CNI installation to succeed for kind
-      preset-kind-volume-mounts: "true"
-      # sets up the azure community parameters used for testing
-      preset-azure-community: "true"
-    spec:
-      containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-master
-        command:
-          - runner.sh
-        args:
-          - bash
-          - -c
-          - >-
-            ./test/scripts/run-e2e-windows.sh
-        securityContext:
-          privileged: true
-        resources:
-          requests:
-            cpu: "4"
-            memory: "6Gi"
-          limits:
-            cpu: "4"
-            memory: "6Gi"
-    annotations:
-      testgrid-dashboards: sig-auth-secrets-store-csi-driver, sig-auth-secrets-store-csi-driver-presubmit
-      testgrid-tab-name: pr-secrets-store-csi-driver-e2e-azure-prow-migration-test
-      description: "Run e2e test with azure provider for Secrets Store CSI driver. This job is used for testing the migration to eks-prow-build-cluster."
+      testgrid-tab-name: pr-secrets-store-csi-driver-e2e-windows
+      description: "Run E2E tests on a AKS Windows cluster for Secrets Store CSI driver."
       testgrid-num-columns-recent: '30'
 
   # release jobs
@@ -837,6 +754,7 @@ presubmits:
       description: "Run e2e test with vault provider for Secrets Store CSI driver release."
       testgrid-num-columns-recent: '30'
   - name: release-secrets-store-csi-driver-e2e-azure
+    cluster: eks-prow-build-cluster
     decorate: true
     decoration_config:
       timeout: 25m
@@ -847,12 +765,8 @@ presubmits:
     - ^main$
     - ^release-*
     labels:
-      # this is required because we want to run kind in docker
       preset-dind-enabled: "true"
-      # this is required to make CNI installation to succeed for kind
-      preset-kind-volume-mounts: "true"
-      # sets up the azure keyvault parameters used for testing
-      preset-azure-secrets-store-creds: "true"
+      preset-azure-community: "true"
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-master
@@ -862,7 +776,7 @@ presubmits:
           - bash
           - -c
           - >-
-            make e2e-bootstrap e2e-helm-deploy-release e2e-azure
+            ./test/scripts/run-e2e-azure.sh
         securityContext:
           privileged: true
         env:
@@ -871,7 +785,10 @@ presubmits:
         resources:
           requests:
             cpu: "4"
-            memory: "4Gi"
+            memory: "6Gi"
+          limits:
+            cpu: "4"
+            memory: "6Gi"
     annotations:
       testgrid-dashboards: sig-auth-secrets-store-csi-driver, sig-auth-secrets-store-csi-driver-release-signal
       testgrid-tab-name: release-secrets-store-csi-driver-e2e-azure
@@ -963,6 +880,7 @@ postsubmits:
       - aramase
       - ritazh
   - name: secrets-store-csi-driver-e2e-azure-postsubmit
+    cluster: eks-prow-build-cluster
     decorate: true
     decoration_config:
       timeout: 25m
@@ -973,10 +891,7 @@ postsubmits:
     labels:
       # this is required because we want to run kind in docker
       preset-dind-enabled: "true"
-      # this is required to make CNI installation to succeed for kind
-      preset-kind-volume-mounts: "true"
-      # sets up the azure keyvault parameters used for testing
-      preset-azure-secrets-store-creds: "true"
+      preset-azure-community: "true"
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240725-1d8ea3e909-master
@@ -986,13 +901,16 @@ postsubmits:
           - bash
           - -c
           - >-
-            make e2e-bootstrap e2e-helm-deploy e2e-azure
+            ./test/scripts/run-e2e-azure.sh
         securityContext:
           privileged: true
         resources:
           requests:
             cpu: "4"
-            memory: "4Gi"
+            memory: "6Gi"
+          limits:
+            cpu: "4"
+            memory: "6Gi"
     annotations:
       testgrid-dashboards: sig-auth-secrets-store-csi-driver, sig-auth-secrets-store-csi-driver-postsubmit
       testgrid-tab-name: secrets-store-csi-driver-e2e-azure-postsubmit