Request ephemeral-storage for 1-27-test-presubmit (#539)

aws · Sep 6, 2023 · 68f0829 · 68f0829
1 parent 3f7837f
commit 68f0829
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 32 deletions.
diff --git a/jobs/aws/eks-distro/kubernetes-1-27-test-presubmits.yaml b/jobs/aws/eks-distro/kubernetes-1-27-test-presubmits.yaml
@@ -24,20 +24,18 @@ presubmits:
     always_run: false
     run_if_changed: "projects/kubernetes/kubernetes/1-27/(GIT_TAG|patches)"
     max_concurrency: 10
-    cluster: "prow-postsubmits-cluster"
+    cluster: "prow-presubmits-cluster"
     skip_report: false
     decoration_config:
       gcs_configuration:
-        bucket: s3://prowdataclusterstack-316434458-prowbucket7c73355c-1n9f9v93wpjcm
+        bucket: s3://prowpresubmitsdataclusterstack-prowbucket7c73355c-vfwwxd2eb4gp
         path_strategy: explicit
       s3_credentials_secret: s3-credentials
     labels:
       disk-usage: "true"
     spec:
-      serviceaccountName: postsubmits-build-account
+      serviceaccountName: presubmits-build-account
       automountServiceAccountToken: false
-      nodeSelector:
-        arch: AMD64
       containers:
       - name: build-container
         image: public.ecr.aws/eks-distro-build-tooling/builder-base:standard-db4232c256f3148b52205cce52f15716beec4011.2
@@ -55,8 +53,9 @@ presubmits:
           value: "1-27"
         resources:
           requests:
-            memory: "16Gi"
-            cpu: "4"
+            memory: "32Gi"
+            cpu: "16"
+            ephemeral-storage: "50Gi"
       - command:
         - sh
         args:

diff --git a/linter/main.go b/linter/main.go
@@ -121,9 +121,6 @@ func PresubmitBucketCheck(jc *JobConstants) presubmitCheck {
 		if strings.Contains(presubmitConfig.JobBase.Name, "builder-base-tooling-presubmit") {
 			return true, 0, ""
 		}
-		if strings.Contains(presubmitConfig.JobBase.Name, "kubernetes-1-27-test-presubmit") {
-			return true, 0, ""
-		}
 		if presubmitConfig.JobBase.UtilityConfig.DecorationConfig.GCSConfiguration.Bucket != jc.Bucket {
 			return false, findLineNumber(fileContentsString, "bucket:"), fmt.Sprintf(`Incorrect bucket configuration, please configure S3 bucket as => bucket: %s`, jc.Bucket)
 		}
@@ -145,9 +142,6 @@ func PresubmitClusterCheck(jc *JobConstants) presubmitCheck {
 		if strings.Contains(presubmitConfig.JobBase.Name, "builder-base-tooling-presubmit") {
 			return true, 0, ""
 		}
-		if strings.Contains(presubmitConfig.JobBase.Name, "kubernetes-1-27-test-presubmit") {
-			return true, 0, ""
-		}
 		if presubmitConfig.JobBase.Cluster != jc.Cluster {
 			return false, findLineNumber(fileContentsString, "cluster:"), fmt.Sprintf(`Incorrect cluster configuration, please configure cluster as => cluster: "%s"`, jc.Cluster)
 		}
@@ -169,9 +163,6 @@ func PresubmitServiceAccountCheck(jc *JobConstants) presubmitCheck {
 		if strings.Contains(presubmitConfig.JobBase.Name, "builder-base-tooling-presubmit") {
 			return true, 0, ""
 		}
-		if strings.Contains(presubmitConfig.JobBase.Name, "kubernetes-1-27-test-presubmit") {
-			return true, 0, ""
-		}
 		if presubmitConfig.JobBase.Spec.ServiceAccountName != jc.ServiceAccountName {
 			return false, findLineNumber(fileContentsString, "serviceaccountName:"), fmt.Sprintf(`Incorrect service account configuration, please configure service account as => serviceaccountName: %s`, jc.ServiceAccountName)
 		}

diff --git a/templater/jobs/presubmit/eks-distro/kubernetes-1-X-test-presubmits.yaml b/templater/jobs/presubmit/eks-distro/kubernetes-1-X-test-presubmits.yaml
@@ -6,28 +6,13 @@ projectPath: projects/kubernetes/kubernetes
 envVars:
 - name: RELEASE_BRANCH
   value: {{ .releaseBranch }}
-
-# The following `if` block is a temp solution while awaiting more storage in presubmits from Fargate team.
-# Once we have more space available we should move this back to the presubmit cluster
-{{ if eq .releaseBranch "1-27" }}
-architecture: AMD64
-cluster: prow-postsubmits-cluster
-resources:
-  limits:
-    cpu: 4
-    memory: 16Gi
-  requests:
-    cpu: 4
-    memory: 16Gi
-{{ else }}
 resources:
   limits:
     cpu: 16
     memory: 32Gi
   requests:
     cpu: 16
     memory: 32Gi
-    {{ if eq .releaseBranch "1-28" }}
+    {{ if or (eq .releaseBranch "1-27") (eq .releaseBranch "1-28") }}
     ephemeral-storage: "50Gi"
     {{ end }}
-{{ end }}