fix rmdata labels which prevented the pvc from getting removed

jmccormick2001 · jmccormick2001 · commit 2411df7cc395 · 2018-08-17T11:05:40.000-04:00
diff --git a/conf/postgres-operator/rmdata-job.json b/conf/postgres-operator/rmdata-job.json
@@ -6,7 +6,9 @@
 	"labels": {
         	"vendor": "crunchydata",
                	"pgrmdata": "true",
-		"pg-cluster": "{{.ClusterName}}"
+		"pg-cluster": "{{.ClusterName}}",
+                "pg-database": "{{.Name}}",
+                "claimName": "{{.PvcName}}"
 	}
     },
     "spec": {
diff --git a/controller/jobcontroller.go b/controller/jobcontroller.go
@@ -86,10 +86,11 @@ func (c *JobController) onAdd(obj interface{}) {
 // onUpdate is called when a pgcluster is updated
 func (c *JobController) onUpdate(oldObj, newObj interface{}) {
 	job := newObj.(*apiv1.Job)
-	log.Infof("[JobCONTROLLER] OnUpdate %s succeeded=%d", job.ObjectMeta.SelfLink, job.Status.Succeeded)
+	log.Debugf("[JobCONTROLLER] OnUpdate %s active=%d succeeded=%d conditions=[%v]", job.ObjectMeta.SelfLink, job.Status.Active, job.Status.Succeeded, job.Status.Conditions)
 	//label is "pgrmdata" and Status of Succeeded
 	labels := job.GetObjectMeta().GetLabels()
 	if job.Status.Succeeded > 0 && labels[util.LABEL_RMDATA] != "" {
+		log.Debugf("rmdata job labels=[%v]", labels)
 		log.Debugf("got a pgrmdata job status=%d", job.Status.Succeeded)
 		//remove the pvc referenced by that job
 		log.Debugf("deleting pvc " + labels["claimName"])
diff --git a/operator/task/rmdata.go b/operator/task/rmdata.go
@@ -59,6 +59,7 @@ func RemoveData(namespace string, clientset *kubernetes.Clientset, task *crv1.Pg
 			SecurityContext: util.CreateSecContext(task.Spec.StorageSpec.Fsgroup, task.Spec.StorageSpec.SupplementalGroups),
 			DataRoot:        task.Spec.Name,
 		}
+		log.Debugf("creating rmdata job for pvc [%s]", pvcName)
 
 		var doc2 bytes.Buffer
 		err := operator.RmdatajobTemplate.Execute(&doc2, jobFields)

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ func RemoveData(namespace string, clientset kubernetes.Clientset, task crv1.Pg`
`59`	`59`	`SecurityContext: util.CreateSecContext(task.Spec.StorageSpec.Fsgroup, task.Spec.StorageSpec.SupplementalGroups),`
`60`	`60`	`DataRoot: task.Spec.Name,`
`61`	`61`	`}`
	`62`	`+ log.Debugf("creating rmdata job for pvc [%s]", pvcName)`
`62`	`63`
`63`	`64`	`var doc2 bytes.Buffer`
`64`	`65`	`err := operator.RmdatajobTemplate.Execute(&doc2, jobFields)`