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.

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

cleanup legacy GCP janitor jobs #33234

Merged
merged 2 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -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
Expand Down
62 changes: 0 additions & 62 deletions config/jobs/kubernetes/test-infra/janitors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions config/tests/jobs/jobs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions docs/job-migration-todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -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=)|