From 1c168e44ef7775b2f95d68b2de56e3e0f0f90889 Mon Sep 17 00:00:00 2001
From: Travis Clarke <clarketm@users.noreply.github.com>
Date: Fri, 21 Feb 2020 11:44:46 -0800
Subject: [PATCH] Revert "Upgrade boskos (#2358)"

This reverts commit 96409537ba4ee5c67dac442e6cbd56943799c779.
---
 boskos/cluster/boskos-deployment.yaml  | 2 +-
 boskos/cluster/cleaner-deployment.yaml | 2 +-
 boskos/cluster/janitor-deployment.yaml | 6 ++----
 boskos/cluster/metrics-deployment.yaml | 2 +-
 boskos/cluster/reaper-deployment.yaml  | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/boskos/cluster/boskos-deployment.yaml b/boskos/cluster/boskos-deployment.yaml
index c596e05f5b2..0c1380c1408 100644
--- a/boskos/cluster/boskos-deployment.yaml
+++ b/boskos/cluster/boskos-deployment.yaml
@@ -58,7 +58,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
       - name: boskos
-        image: gcr.io/k8s-prow/boskos/boskos:v20200206-f88edefe8
+        image: gcr.io/k8s-prow/boskos/boskos:v20190730-dbac84bd7
         args:
         - --config=/etc/config/resources.yaml
         - --namespace=boskos
diff --git a/boskos/cluster/cleaner-deployment.yaml b/boskos/cluster/cleaner-deployment.yaml
index 20703ede727..854cc8a8929 100644
--- a/boskos/cluster/cleaner-deployment.yaml
+++ b/boskos/cluster/cleaner-deployment.yaml
@@ -56,7 +56,7 @@ spec:
       terminationGracePeriodSeconds: 300
       containers:
       - name: boskos-cleaner
-        image: gcr.io/k8s-prow/boskos/cleaner:v20200206-f88edefe8
+        image: gcr.io/k8s-prow/boskos/cleaner:v20190730-dbac84bd7
         args:
         - --cleaner-count=3
         - --namespace=boskos
diff --git a/boskos/cluster/janitor-deployment.yaml b/boskos/cluster/janitor-deployment.yaml
index 0d25993f53c..374280566af 100644
--- a/boskos/cluster/janitor-deployment.yaml
+++ b/boskos/cluster/janitor-deployment.yaml
@@ -15,13 +15,11 @@ spec:
       terminationGracePeriodSeconds: 300
       containers:
       - name: boskos-janitor
-        image: gcr.io/k8s-prow/boskos/janitor:v20200206-f88edefe8
+        image: gcr.io/k8s-testimages/janitor:v20180725-c421ed4f9
         args:
+        - --service-account=/etc/service-account/service-account.json
         - --resource-type=gcp-project,gcp-perf-test
         - --pool-size=20
-        - --
-        - --service_account=/etc/service-account/service-account.json
-        - --hours=1
         volumeMounts:
         - mountPath: /etc/service-account
           name: boskos-service-account
diff --git a/boskos/cluster/metrics-deployment.yaml b/boskos/cluster/metrics-deployment.yaml
index b564719d373..4b9d6f34fac 100644
--- a/boskos/cluster/metrics-deployment.yaml
+++ b/boskos/cluster/metrics-deployment.yaml
@@ -16,7 +16,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
       - name: metrics
-        image: gcr.io/k8s-prow/boskos/metrics:v20200206-f88edefe8
+        image: gcr.io/k8s-prow/boskos/metrics:v20190730-dbac84bd7
         args:
         - --resource-type=gke-perf-preset,gcp-perf-test,gcp-project,gke-e2e-test
         ports:
diff --git a/boskos/cluster/reaper-deployment.yaml b/boskos/cluster/reaper-deployment.yaml
index 1baa3367c46..706e95c6841 100644
--- a/boskos/cluster/reaper-deployment.yaml
+++ b/boskos/cluster/reaper-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
       - name: boskos-reaper
-        image: gcr.io/k8s-prow/boskos/reaper:v20200206-f88edefe8
+        image: gcr.io/k8s-prow/boskos/reaper:v20190730-dbac84bd7
         args:
         - --resource-type=gke-perf-preset,gcp-perf-test,gcp-project,gke-e2e-test
       nodeSelector: