From 731ec5802f849ace4151b368e401b23088408f34 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Wed, 29 Sep 2021 16:24:18 -0700 Subject: [PATCH 1/2] rm missing projects from janitors --- experiment/ci-janitor/main.go | 6 ------ scenarios/kubernetes_janitor.py | 6 ------ 2 files changed, 12 deletions(-) diff --git a/experiment/ci-janitor/main.go b/experiment/ci-janitor/main.go index 10bd46a1fcec..b0f1cd6a1ddb 100644 --- a/experiment/ci-janitor/main.go +++ b/experiment/ci-janitor/main.go @@ -42,14 +42,8 @@ var ( "kubernetes-scale", // Let it's up/down job handle the resources "k8s-scale-testing", // As it can be running some manual experiments // PR projects, migrate to boskos! - "k8s-jkns-pr-gce", - "k8s-jkns-pr-gce-bazel", - "k8s-jkns-pr-gce-etcd3", - "k8s-jkns-pr-gci-gce", "k8s-jkns-pr-gci-gke", - "k8s-jkns-pr-gci-kubemark", "k8s-jkns-pr-gke", - "k8s-jkns-pr-kubeadm", "k8s-jkns-pr-kubemark", "k8s-jkns-pr-node-e2e", "k8s-jkns-pr-gce-gpus", diff --git a/scenarios/kubernetes_janitor.py b/scenarios/kubernetes_janitor.py index 3d3f9f365331..2fbd30603dde 100755 --- a/scenarios/kubernetes_janitor.py +++ b/scenarios/kubernetes_janitor.py @@ -92,15 +92,9 @@ def clean_project(project, hours=24, dryrun=False, ratelimit=None, filt=None): # k8s-jkns-pr-cnry-e2e-gce-fdrtn # cleans up resources older than 3h # which is more than enough for presubmit jobs to finish. - 'k8s-jkns-pr-gce': 3, - 'k8s-jkns-pr-gce-bazel': 3, - 'k8s-jkns-pr-gce-etcd3': 3, - 'k8s-jkns-pr-gci-gce': 3, 'k8s-jkns-pr-gci-gke': 3, - 'k8s-jkns-pr-gci-kubemark': 3, 'k8s-jkns-pr-gke': 3, 'k8s-jkns-pr-kubeadm': 3, - 'k8s-jkns-pr-kubemark': 3, 'k8s-jkns-pr-node-e2e': 3, 'k8s-jkns-pr-gce-gpus': 3, } From 18bc2b3270f8decdd44cd3c38b8e2f6b26428b0a Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Wed, 29 Sep 2021 16:28:30 -0700 Subject: [PATCH 2/2] experiment/ci-janitor: exclude k8s-infra projects --- experiment/ci-janitor/main.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/experiment/ci-janitor/main.go b/experiment/ci-janitor/main.go index b0f1cd6a1ddb..869d337833bd 100644 --- a/experiment/ci-janitor/main.go +++ b/experiment/ci-janitor/main.go @@ -48,6 +48,9 @@ var ( "k8s-jkns-pr-node-e2e", "k8s-jkns-pr-gce-gpus", "k8s-presubmit-scale", + // k8s-infra projects, can't be cleaned by k8s-prow serviceaccounts + "k8s-infra-e2e-scale-5k-project", + "k8s-infra-e2e-gpu-project", } )