kubernetes · spxtr · Mar 30, 2017 · Mar 10, 2017
diff --git a/prow/Makefile b/prow/Makefile
@@ -17,7 +17,7 @@ all: build test
 
 HOOK_VERSION       = 0.95
 LINE_VERSION       = 0.86
-SINKER_VERSION     = 0.5
+SINKER_VERSION     = 0.6
 DECK_VERSION       = 0.18
 SPLICE_VERSION     = 0.16
 MARQUE_VERSION     = 0.1

diff --git a/prow/cluster/prow_job.yaml b/prow/cluster/prow_job.yaml
@@ -0,0 +1,6 @@
+apiVersion: extensions/v1beta1
+kind: ThirdPartyResource
+metadata:
+  name: prow-job.prow.k8s.io
+versions:
+- name: v1
diff --git a/prow/cluster/sinker_deployment.yaml b/prow/cluster/sinker_deployment.yaml
@@ -15,4 +15,4 @@ spec:
         role: prow
       containers:
       - name: sinker
-        image: gcr.io/k8s-prow/sinker:0.5
+        image: gcr.io/k8s-prow/sinker:0.6
diff --git a/prow/cmd/sinker/main.go b/prow/cmd/sinker/main.go
@@ -36,6 +36,9 @@ type kubeClient interface {
 
 	ListJobs(labels map[string]string) ([]kube.Job, error)
 	DeleteJob(name string) error
+
+	ListProwJobs(labels map[string]string) ([]kube.ProwJob, error)
+	DeleteProwJob(name string) error
 }
 
 func main() {
@@ -56,7 +59,23 @@ func main() {
 }
 
 func clean(kc kubeClient) {
-	// Clean up old jobs first.
+	// Clean up old prow jobs first.
+	prowJobs, err := kc.ListProwJobs(nil)
+	if err != nil {
+		logrus.WithError(err).Error("Error listing prow jobs.")
+		return
+	}
+	for _, prowJob := range prowJobs {
+		if !prowJob.Status.CompletionTime.IsZero() && time.Since(prowJob.Status.StartTime) > maxAge {
+			if err := kc.DeleteProwJob(prowJob.Metadata.Name); err == nil {
+				logrus.WithField("prowjob", prowJob.Metadata.Name).Info("Deleted prowjob.")
+			} else {
+				logrus.WithField("prowjob", prowJob.Metadata.Name).WithError(err).Error("Error deleting prowjob.")
+			}
+		}
+	}
+
+	// Then old jobs.
 	jobs, err := kc.ListJobs(nil)
 	if err != nil {
 		logrus.WithError(err).Error("Error listing jobs.")

diff --git a/prow/cmd/sinker/main_test.go b/prow/cmd/sinker/main_test.go
@@ -25,11 +25,13 @@ import (
 )
 
 type fakeClient struct {
-	Pods []kube.Pod
-	Jobs []kube.Job
+	Pods     []kube.Pod
+	Jobs     []kube.Job
+	ProwJobs []kube.ProwJob
 
-	DeletedPods []kube.Pod
-	DeletedJobs []kube.Job
+	DeletedPods     []kube.Pod
+	DeletedJobs     []kube.Job
+	DeletedProwJobs []kube.ProwJob
 }
 
 func (c *fakeClient) ListPods(labels map[string]string) ([]kube.Pod, error) {
@@ -52,6 +54,27 @@ func (c *fakeClient) ListJobs(labels map[string]string) ([]kube.Job, error) {
 	return jl, nil
 }
 
+func (c *fakeClient) ListProwJobs(labels map[string]string) ([]kube.ProwJob, error) {
+	jl := make([]kube.ProwJob, 0, len(c.ProwJobs))
+	for _, j := range c.ProwJobs {
+		if labelsMatch(labels, j.Metadata.Labels) {
+			jl = append(jl, j)
+		}
+	}
+	return jl, nil
+}
+
+func (c *fakeClient) DeleteProwJob(name string) error {
+	for i, j := range c.ProwJobs {
+		if j.Metadata.Name == name {
+			c.ProwJobs = append(c.ProwJobs[:i], c.ProwJobs[i+1:]...)
+			c.DeletedProwJobs = append(c.DeletedProwJobs, j)
+			return nil
+		}
+	}
+	return fmt.Errorf("prowjob %s not found", name)
+}
+
 func (c *fakeClient) DeleteJob(name string) error {
 	for i, j := range c.Jobs {
 		if j.Metadata.Name == name {
@@ -233,9 +256,40 @@ func TestClean(t *testing.T) {
 		"old, deleted",
 		"old, aborted with pod",
 	}
+	prowJobs := []kube.ProwJob{
+		{
+			Metadata: kube.ObjectMeta{
+				Name: "old, complete",
+			},
+			Status: kube.ProwJobStatus{
+				StartTime:      time.Now().Add(-maxAge).Add(-time.Second),
+				CompletionTime: time.Now().Add(-time.Second),
+			},
+		},
+		{
+			Metadata: kube.ObjectMeta{
+				Name: "old, incomplete",
+			},
+			Status: kube.ProwJobStatus{
+				StartTime: time.Now().Add(-maxAge).Add(-time.Second),
+			},
+		},
+		{
+			Metadata: kube.ObjectMeta{
+				Name: "new",
+			},
+			Status: kube.ProwJobStatus{
+				StartTime: time.Now().Add(-time.Second),
+			},
+		},
+	}
+	deletedProwJobs := []string{
+		"old, complete",
+	}
 	kc := &fakeClient{
-		Pods: pods,
-		Jobs: jobs,
+		Pods:     pods,
+		Jobs:     jobs,
+		ProwJobs: prowJobs,
 	}
 	clean(kc)
 	if len(deletedPods) != len(kc.DeletedPods) {
@@ -266,4 +320,18 @@ func TestClean(t *testing.T) {
 			t.Errorf("Did not delete job %s", n)
 		}
 	}
+	if len(deletedProwJobs) != len(kc.DeletedProwJobs) {
+		t.Errorf("Deleted wrong number of prowjobs: got %v expected %v", kc.DeletedProwJobs, deletedProwJobs)
+	}
+	for _, n := range deletedProwJobs {
+		found := false
+		for _, j := range kc.DeletedProwJobs {
+			if j.Metadata.Name == n {
+				found = true
+			}
+		}
+		if !found {
+			t.Errorf("Did not delete prowjob %s", n)
+		}
+	}
 }
diff --git a/prow/kube/client.go b/prow/kube/client.go
@@ -227,6 +227,27 @@ func (c *Client) DeletePod(name string) error {
 	}, nil)
 }
 
+func (c *Client) ListProwJobs(labels map[string]string) ([]ProwJob, error) {
+	c.log("ListProwJobs", labels)
+	var jl struct {
+		Items []ProwJob `json:"items"`
+	}
+	err := c.request(&request{
+		method: http.MethodGet,
+		path:   fmt.Sprintf("/apis/prow.k8s.io/v1/namespaces/%s/prowjobs", c.namespace),
+		query:  map[string]string{"labelSelector": labelsToSelector(labels)},
+	}, &jl)
+	return jl.Items, err
+}
+
+func (c *Client) DeleteProwJob(name string) error {
+	c.log("DeleteProwJob", name)
+	return c.request(&request{
+		method: http.MethodDelete,
+		path:   fmt.Sprintf("/apis/prow.k8s.io/v1/namespaces/%s/prowjobs/%s", c.namespace, name),
+	}, nil)
+}
+
 func (c *Client) GetJob(name string) (Job, error) {
 	c.log("GetJob", name)
 	var retJob Job

diff --git a/prow/kube/types.go b/prow/kube/types.go
@@ -30,6 +30,19 @@ type ObjectMeta struct {
 	UID             string `json:"uid,omitempty"`
 }
 
+type ProwJob struct {
+	Metadata ObjectMeta    `json:"metadata,omitempty"`
+	Spec     ProwJobSpec   `json:"spec,omitempty"`
+	Status   ProwJobStatus `json:"status,omitempty"`
+}
+
+type ProwJobSpec struct{}
+
+type ProwJobStatus struct {
+	StartTime      time.Time `json:"startTime,omitempty"`
+	CompletionTime time.Time `json:"completionTime,omitempty"`
+}
+
 type Secret struct {
 	Metadata ObjectMeta        `json:"metadata,omitempty"`
 	Data     map[string]string `json:"data,omitempty"`