Merge pull request #33234 from BenTheElder/more-cleaning

cleanup legacy GCP janitor jobs
kubernetes · Aug 6, 2024 · d72c3fc · d72c3fc
2 parents 89e8cdf + 80bad6c
commit d72c3fc
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 105 deletions.
diff --git a/config/jobs/kubernetes/sig-scalability/sig-scalability-cleanup.yaml b/config/jobs/kubernetes/sig-scalability/sig-scalability-cleanup.yaml
@@ -1,41 +1,4 @@
 periodics:
-- interval: 24h
-  name: ci-kubernetes-e2e-scalability-cleanup
-  labels:
-    preset-service-account: "true"
-  decorate: true
-  decoration_config:
-    timeout: 60m
-  extra_refs:
-  - org: kubernetes
-    repo: perf-tests
-    base_ref: master
-    path_alias: k8s.io/perf-tests
-  - org: kubernetes
-    repo: test-infra
-    base_ref: master
-    path_alias: k8s.io/test-infra
-  annotations:
-    testgrid-dashboards: sig-scalability-experiments
-    testgrid-tab-name: snapshots-cleanup
-  spec:
-    containers:
-    - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-master
-      command:
-      - runner.sh
-      args:
-      - $(GOPATH)/src/k8s.io/perf-tests/clusterloader2/clean-up-old-snapshots-boskos.sh
-      # Command (list|delete)
-      - delete
-      # Comma-separated list of snapshot prefixes to delete
-      - ci-kubernetes-e2e-gci-gce-scalability
-      # Delete snapshots older than x days
-      - "30"
-      # Comma-separated list of boskos pools to process
-      - scalability-project
-      # File with boskos resource definitions
-      - $(GOPATH)/src/k8s.io/test-infra/config/prow/cluster/build/boskos-resources/boskos-resources.yaml
-
 - name: ci-kubernetes-scalability-cleanup-golang-builds-canary
   cluster: k8s-infra-prow-build
   interval: 24h

diff --git a/config/jobs/kubernetes/test-infra/janitors.yaml b/config/jobs/kubernetes/test-infra/janitors.yaml
@@ -48,65 +48,3 @@ periodics:
     testgrid-dashboards: sig-testing-maintenance
     testgrid-tab-name: ci-aws-janitor
     description: Deletes old AWS resources
-
-- interval: 24h
-  name: maintenance-ci-janitor
-  labels:
-    preset-service-account: "true"
-  decorate: true
-  extra_refs:
-  - org: kubernetes
-    repo: test-infra
-    base_ref: master
-    path_alias: k8s.io/test-infra
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      args:
-      - go
-      - run
-      - experiment/ci-janitor/main.go
-      - --config-path=config/prow/config.yaml
-      - --job-config-path=config/jobs
-      - --janitor-path=boskos/cmd/janitor/gcp_janitor.py
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-master
-      resources:
-        requests:
-          cpu: 5
-          memory: "8Gi"
-  annotations:
-    testgrid-dashboards: sig-testing-maintenance
-    testgrid-tab-name: ci-janitor
-    description: Deletes old GCP resources from periodic jobs
-
-- interval: 1h
-  name: maintenance-pull-janitor
-  labels:
-    preset-service-account: "true"
-  decorate: true
-  decoration_config:
-    timeout: 30m
-  extra_refs:
-  - org: kubernetes
-    repo: test-infra
-    base_ref: master
-    path_alias: k8s.io/test-infra
-    workdir: true
-  spec:
-    containers:
-    - command:
-      - runner.sh
-      - /home/prow/go/src/k8s.io/test-infra/scenarios/kubernetes_janitor.py
-      args:
-      - --mode=pr
-      env:
-      image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-experimental
-      resources:
-        requests:
-          cpu: 5
-          memory: "8Gi"
-  annotations:
-    testgrid-dashboards: sig-testing-maintenance
-    testgrid-tab-name: pull-janitor
-    description: Deletes old GCP resources from presubmit jobs
diff --git a/config/tests/jobs/jobs_test.go b/config/tests/jobs/jobs_test.go
@@ -578,9 +578,6 @@ func TestCommunityJobs(t *testing.T) {
 		"pull-azuredisk-csi-driver-e2e-windows-mainv2",
 		"pull-azurefile-csi-driver-e2e-windows",
 		"pull-azurefile-csi-driver-e2e-windows-containerd",
-		"ci-kubernetes-e2e-scalability-cleanup",
-		"maintenance-ci-janitor",
-		"maintenance-pull-janitor",
 	)
 
 	// error if any unknown job tries to use one of these clusters

diff --git a/docs/job-migration-todo.md b/docs/job-migration-todo.md
@@ -287,6 +287,3 @@ For more context, see the announcement thread at https://groups.google.com/a/kub
 |[service-account ssh-key-secret azure-cred azure-ssh]|config/jobs/kubernetes-sigs/azuredisk-csi-driver/azuredisk-csi-driver-v2-config.yaml|pull-azuredisk-csi-driver-e2e-windows-mainv2|[Search Results](https://cs.k8s.io/?q=name%3A%20pull-azuredisk-csi-driver-e2e-windows-mainv2%24&i=nope&files=&excludeFiles=&repos=)|
 |[service-account ssh-key-secret azure-cred azure-ssh]|config/jobs/kubernetes-sigs/azurefile-csi-driver/azurefile-csi-driver-config.yaml|pull-azurefile-csi-driver-e2e-windows|[Search Results](https://cs.k8s.io/?q=name%3A%20pull-azurefile-csi-driver-e2e-windows%24&i=nope&files=&excludeFiles=&repos=)|
 |[service-account ssh-key-secret azure-cred azure-ssh]|config/jobs/kubernetes-sigs/azurefile-csi-driver/azurefile-csi-driver-config.yaml|pull-azurefile-csi-driver-e2e-windows-containerd|[Search Results](https://cs.k8s.io/?q=name%3A%20pull-azurefile-csi-driver-e2e-windows-containerd%24&i=nope&files=&excludeFiles=&repos=)|
-|[service-account]|config/jobs/kubernetes/sig-scalability/sig-scalability-cleanup.yaml|ci-kubernetes-e2e-scalability-cleanup|[Search Results](https://cs.k8s.io/?q=name%3A%20ci-kubernetes-e2e-scalability-cleanup%24&i=nope&files=&excludeFiles=&repos=)|
-|[service-account]|config/jobs/kubernetes/test-infra/janitors.yaml|maintenance-ci-janitor|[Search Results](https://cs.k8s.io/?q=name%3A%20maintenance-ci-janitor%24&i=nope&files=&excludeFiles=&repos=)|
-|[service-account]|config/jobs/kubernetes/test-infra/janitors.yaml|maintenance-pull-janitor|[Search Results](https://cs.k8s.io/?q=name%3A%20maintenance-pull-janitor%24&i=nope&files=&excludeFiles=&repos=)|