From 5db59fa8071bb7f2df2dbc3bf753efe4da01bbda Mon Sep 17 00:00:00 2001 From: Anish Ramasekar Date: Fri, 26 Jul 2024 12:01:08 -0700 Subject: [PATCH 1/2] secrets-store: move all azure jobs to eks prow cluster Signed-off-by: Anish Ramasekar --- .../secrets-store-csi-driver-config.yaml | 52 ++++++++++--------- 1 file changed, 28 insertions(+), 24 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 index a857f4fdc797..b0313112af99 100644 --- 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 @@ -630,10 +631,9 @@ presubmits: - ^main$ - ^release-* labels: - preset-azure-cred: "true" + preset-azure-community: "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 @@ -643,13 +643,16 @@ presubmits: - bash - -c - >- - ./test/scripts/run-e2e-windows.sh + ./test/scripts/run-e2e-azure.sh securityContext: privileged: true resources: requests: cpu: "4" - memory: "4Gi" + memory: "6Gi" + limits: + cpu: "4" + memory: "6Gi" env: - name: TEST_WINDOWS value: "true" @@ -837,6 +840,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 +851,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 +862,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 +871,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 +966,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 +977,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 +987,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 From 551d3f1a4a99ad896e54ee4f383da7667659a253 Mon Sep 17 00:00:00 2001 From: Anish Ramasekar Date: Fri, 26 Jul 2024 12:01:40 -0700 Subject: [PATCH 2/2] secrets-store: remove temp jobs that were added for testing migration Signed-off-by: Anish Ramasekar --- .../secrets-store-csi-driver-config.yaml | 86 ------------------- 1 file changed, 86 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 index b0313112af99..578c06b500d7 100644 --- 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 @@ -661,92 +661,6 @@ presubmits: 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" - preset-dind-enabled: "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" - 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-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-num-columns-recent: '30' # release jobs - name: release-secrets-store-csi-driver-e2e-aws