Skip to content

Commit

Permalink
boskos: Deploying a new Boskos janitor for AWS
Browse files Browse the repository at this point in the history
This patch deploys a new Boskos janitor as a service in the same cluster
running Prow. The new service is named `boskos-janitor-aws`.

Related to kubernetes-sigs/cluster-api-provider-aws#272 and
kubernetes-sigs/cluster-api-provider-aws#606.

/area boskos
  • Loading branch information
akutz authored and detiber committed Mar 20, 2019
1 parent ece7369 commit a9bd3d4
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 2 deletions.
11 changes: 10 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ reaper:
janitor:
go build -o janitor/janitor k8s.io/test-infra/boskos/janitor/

janitor-aws:
$(MAKE) -C ../maintenance/aws-janitor/cmd/aws-janitor-boskos

metrics:
go build -o metrics/metrics k8s.io/test-infra/boskos/metrics/

Expand All @@ -53,6 +56,12 @@ janitor-image:
docker push "$(HUB)/janitor:$(TAG)"
rm janitor/janitor

janitor-aws-image: export DOCKER_OPTS=--no-cache
janitor-aws-image: export IMAGE=$(HUB)/janitor-aws
janitor-aws-image:
$(MAKE) -C ../maintenance/aws-janitor/cmd/aws-janitor-boskos image push
$(MAKE) -C ../maintenance/aws-janitor/cmd/aws-janitor-boskos clean

metrics-image:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o metrics/metrics k8s.io/test-infra/boskos/metrics/
docker build -t "$(HUB)/metrics:$(TAG)" metrics
Expand Down Expand Up @@ -81,4 +90,4 @@ update-config: get-cluster-credentials
get-cluster-credentials:
gcloud container clusters get-credentials "$(CLUSTER)" --project="$(PROJECT)" --zone="$(ZONE)"

.PHONY: boskos client reaper janitor metrics server-image reaper-image janitor-image metrics-image server-deployment reaper-deployment janitor-deployment metrics-deployment service update-config get-cluster-credentials
.PHONY: boskos client reaper janitor janitor-aws metrics server-image reaper-image janitor-image janitor-aws-image metrics-image server-deployment reaper-deployment janitor-deployment metrics-deployment service update-config get-cluster-credentials
22 changes: 21 additions & 1 deletion janitor/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,24 @@ spec:
- name: service
secret:
secretName: service-account

---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: boskos-janitor-aws
labels:
app: boskos-janitor-aws
namespace: test-pods
spec:
replicas: 4 # 4 distributed janitor instances
template:
metadata:
labels:
app: boskos-janitor-aws
spec:
terminationGracePeriodSeconds: 300
containers:
- name: boskos-janitor-aws
image: gcr.io/k8s-testimages/janitor-aws:latest
args:
- --boskos-url=http://boskos.test-pods.svc.cluster.local.

0 comments on commit a9bd3d4

Please sign in to comment.