From e54946dda6c054e2f1ec4c10e0ae1baaefb03aa8 Mon Sep 17 00:00:00 2001
From: Iftach Konshtok <iftash@gmail.com>
Date: Wed, 21 Jun 2023 10:00:12 -0400
Subject: [PATCH] jobs: migrate kubernetes/cluster-api-addon-provider-helm jobs
 to eks cluster

- Add missing resource blocks
- remove unused decoration_config

Signed-off-by: Iftach Konshtok <iftash@gmail.com>
---
 ...i-addon-provider-helm-presubmits-main.yaml | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/config/jobs/kubernetes-sigs/cluster-api-addon-provider-helm/cluster-api-addon-provider-helm-presubmits-main.yaml b/config/jobs/kubernetes-sigs/cluster-api-addon-provider-helm/cluster-api-addon-provider-helm-presubmits-main.yaml
index 4c664b40baea..700849ac5326 100644
--- a/config/jobs/kubernetes-sigs/cluster-api-addon-provider-helm/cluster-api-addon-provider-helm-presubmits-main.yaml
+++ b/config/jobs/kubernetes-sigs/cluster-api-addon-provider-helm/cluster-api-addon-provider-helm-presubmits-main.yaml
@@ -1,9 +1,8 @@
 presubmits:
   kubernetes-sigs/cluster-api-addon-provider-helm:
   - name: pull-cluster-api-addon-provider-helm-build-main
+    cluster: eks-prow-build-cluster
     decorate: true
-    decoration_config:
-      gcs_credentials_secret: "" # Use workload identity for uploading artifacts
     path_alias: sigs.k8s.io/cluster-api-addon-provider-helm
     always_run: true
     branches:
@@ -16,13 +15,19 @@ presubmits:
         command:
         - runner.sh
         - ./scripts/ci-build.sh
+        resources:
+          limits:
+            cpu: 1
+            memory: 4Gi
+          requests:
+            cpu: 1
+            memory: 4Gi
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-addon-provider-helm
       testgrid-tab-name: caaph-pr-build-main
   - name: pull-cluster-api-addon-provider-helm-apidiff-main
+    cluster: eks-prow-build-cluster
     decorate: true
-    decoration_config:
-      gcs_credentials_secret: "" # Use workload identity for uploading artifacts
     path_alias: sigs.k8s.io/cluster-api-addon-provider-helm
     always_run: true
     optional: true
@@ -36,13 +41,19 @@ presubmits:
         - runner.sh
         - ./scripts/ci-apidiff.sh
         image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230616-e730b60769-1.26
+        resources:
+          limits:
+            cpu: 1
+            memory: 4Gi
+          requests:
+            cpu: 1
+            memory: 4Gi
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-addon-provider-helm
       testgrid-tab-name: caaph-pr-apidiff-main
   - name: pull-cluster-api-addon-provider-helm-verify-main
+    cluster: eks-prow-build-cluster
     decorate: true
-    decoration_config:
-      gcs_credentials_secret: "" # Use workload identity for uploading artifacts
     path_alias: sigs.k8s.io/cluster-api-addon-provider-helm
     always_run: true
     labels:
@@ -58,17 +69,20 @@ presubmits:
         - "runner.sh"
         - ./scripts/ci-verify.sh
         resources:
+          limits:
+            cpu: 7300m
+            memory: 4Gi
           requests:
             cpu: 7300m
+            memory: 4Gi
         securityContext:
           privileged: true
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-addon-provider-helm
       testgrid-tab-name: caaph-pr-verify-main
   - name: pull-cluster-api-addon-provider-helm-test-main
+    cluster: eks-prow-build-cluster
     decorate: true
-    decoration_config:
-      gcs_credentials_secret: "" # Use workload identity for uploading artifacts
     path_alias: sigs.k8s.io/cluster-api-addon-provider-helm
     always_run: true
     branches:
@@ -82,15 +96,18 @@ presubmits:
         - runner.sh
         - ./scripts/ci-test.sh
         resources:
+          limits:
+            cpu: 7300m
+            memory: 4Gi
           requests:
             cpu: 7300m
+            memory: 4Gi
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-addon-provider-helm
       testgrid-tab-name: caaph-pr-test-main
   - name: pull-cluster-api-addon-provider-helm-test-mink8s-main
+    cluster: eks-prow-build-cluster
     decorate: true
-    decoration_config:
-      gcs_credentials_secret: "" # Use workload identity for uploading artifacts
     path_alias: sigs.k8s.io/cluster-api-addon-provider-helm
     always_run: true
     branches:
@@ -112,8 +129,12 @@ presubmits:
         - name: KUBEBUILDER_ENVTEST_KUBERNETES_VERSION
           value: "1.20.2"
         resources:
+          limits:
+            cpu: 7300m
+            memory: 4Gi
           requests:
             cpu: 7300m
+            memory: 4Gi
     annotations:
       testgrid-dashboards: sig-cluster-lifecycle-cluster-api-addon-provider-helm
       testgrid-tab-name: caaph-pr-test-mink8s-main