diff --git a/experiment/ci-janitor/main.go b/experiment/ci-janitor/main.go index 10bd46a1fcec..869d337833bd 100644 --- a/experiment/ci-janitor/main.go +++ b/experiment/ci-janitor/main.go @@ -42,18 +42,15 @@ 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", "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", } ) 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, }