Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Sep 6, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions jobs/aws/eks-distro/kubernetes-1-27-test-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -55,8 +53,9 @@ presubmits:
value: "1-27"
resources:
requests:
memory: "16Gi"
cpu: "4"
memory: "32Gi"
cpu: "16"
ephemeral-storage: "50Gi"
- command:
- sh
args:
Expand Down
9 changes: 0 additions & 9 deletions linter/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down
17 changes: 1 addition & 16 deletions templater/jobs/presubmit/eks-distro/kubernetes-1-X-test-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could probably just make this default for all jobs...

{{ if or (eq .releaseBranch "1-27") (eq .releaseBranch "1-28") }}
ephemeral-storage: "50Gi"
{{ end }}
{{ end }}