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

Document why /boskos directory exists, migrate to make rule #24872

Merged
merged 1 commit into from
Mar 7, 2022
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
8 changes: 8 additions & 0 deletions boskos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,11 @@
Boskos has been moved into its own repository under kubernetes-sigs:

https://github.com/kubernetes-sigs/boskos

# What's still here

The only thing matters here is `./cmd/janitor/gcp_janitor.py` script, which is
still used by
[/scenarios/kubernetes_janitor.py#L66](https://github.com/kubernetes/test-infra/blob/d641897cea52d493ef883a4dfa6728ffdfa02dfa/scenarios/kubernetes_janitor.py#L66),
Copy link
Member

Choose a reason for hiding this comment

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

I forget, is boskos using a different copy of this when deployed to janitor GCP or is this also the main janitor script?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

boskos has it's own gcp_janitor.py script https://github.com/kubernetes-sigs/boskos/blob/master/cmd/janitor/gcp_janitor.py, which is much more recent this this one, assuming the other one is the default?

Copy link
Member

Choose a reason for hiding this comment

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

I don't know 🙈 , Jeff was probably the last person to know.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just in case @ixdy still receives GitHub notification ^^

Copy link
Member

@ixdy ixdy Feb 8, 2022

Choose a reason for hiding this comment

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

I think that the Boskos janitor uses the script from kubernetes-sigs/boskos, since I think it uses the copy baked into the container, which would come from that repo.

I opened #17719 regarding the copy of gcp_janitor.py in test-infra. It was a potentially hairy cleanup effort, and it also wasn't clear whether the jobs even needed to run anymore. With the resolution of #20760, this can probably finally be deleted.

Copy link
Member

Choose a reason for hiding this comment

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

tempted to just disable scheduling those and see what breaks :+)

and `/scenarios` had been announced deprecated since 2018, which will be done
with https://github.com/kubernetes/test-infra/issues/20760.
42 changes: 0 additions & 42 deletions boskos/update_prow_config.sh

This file was deleted.

8 changes: 6 additions & 2 deletions config/jobs/kubernetes/test-infra/test-infra-trusted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -427,9 +427,13 @@ postsubmits:
spec:
serviceAccountName: deployer # TODO(fejta): should be pusher
containers:
- image: gcr.io/k8s-staging-test-infra/bazelbuild:v20210930-b6c4097796-test-infra
- image: gcr.io/k8s-staging-test-infra/gcloud-in-go:v20211210-cf89952124
command:
- ./boskos/update_prow_config.sh
- make
args:
- -C
- config/prow
- update-boskos-resources
annotations:
testgrid-dashboards: sig-testing-maintenance
testgrid-tab-name: boskos-config-upload
Expand Down
7 changes: 5 additions & 2 deletions config/prow/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ ZONE_BUILD ?= us-central1-f
JOB_NAMESPACE ?= test-pods

update-config: get-cluster-credentials
kubectl create configmap config --from-file=config.yaml=config.yaml --dry-run -o yaml | kubectl replace configmap config -f -
kubectl create configmap config --from-file=config.yaml=config.yaml --dry-run=client -o yaml | kubectl replace configmap config -f -

update-plugins: get-cluster-credentials
kubectl create configmap plugins --from-file=plugins.yaml=plugins.yaml --dry-run -o yaml | kubectl replace configmap plugins -f -
kubectl create configmap plugins --from-file=plugins.yaml=plugins.yaml --dry-run=client -o yaml | kubectl replace configmap plugins -f -

deploy-prow: get-cluster-credentials
kubectl apply -f ./cluster/prowjob-crd/legacy/prowjob-schemaless_customresourcedefinition.yaml
Expand All @@ -38,6 +38,9 @@ deploy-prow: get-cluster-credentials
deploy-build: get-build-cluster-credentials
kubectl apply -f ./cluster/build/

update-boskos-resources: get-build-cluster-credentials
kubectl create configmap resources --from-file=config=./cluster/build/boskos-resources.yaml --dry-run=client -o yaml | kubectl --namespace=test-pods replace configmap resources -f -

deploy-monitoring: get-cluster-credentials
$(MAKE) -C ./cluster/monitoring apply

Expand Down