Remove "backoffLimit" from Jobs

jkatz · web-flow · commit f8de33a6340f · 2020-04-09T09:17:38.000-04:00
This reverts to using the Kubernetes default (6), and ensures that
any jobs have a restartPolicy of "Never" due to language in the Kubernetes
docs.
diff --git a/conf/postgres-operator/backrest-job.json b/conf/postgres-operator/backrest-job.json
@@ -12,7 +12,6 @@
                 }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "{{.JobName}}",
@@ -75,7 +74,7 @@
                         }
                     }]
                 }],
-                "restartPolicy": "OnFailure"
+                "restartPolicy": "Never"
             }
         }
     }
diff --git a/conf/postgres-operator/backrest-restore-job.json b/conf/postgres-operator/backrest-restore-job.json
@@ -12,7 +12,6 @@
                 }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "{{.JobName}}",
diff --git a/conf/postgres-operator/pgdump-job.json b/conf/postgres-operator/pgdump-job.json
@@ -11,7 +11,6 @@
         }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "{{.JobName}}",
diff --git a/conf/postgres-operator/pgo.load-template.json b/conf/postgres-operator/pgo.load-template.json
@@ -5,7 +5,6 @@
         "name": "{{.Name}}"
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "{{.Name}}",
diff --git a/conf/postgres-operator/pgo.sqlrunner-template.json b/conf/postgres-operator/pgo.sqlrunner-template.json
@@ -10,7 +10,6 @@
         }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "{{.JobName}}",
diff --git a/conf/postgres-operator/rmdata-job.json b/conf/postgres-operator/rmdata-job.json
@@ -10,7 +10,6 @@
         }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "{{.JobName}}",
diff --git a/installers/ansible/roles/pgo-operator/files/pgo-configs/backrest-job.json b/installers/ansible/roles/pgo-operator/files/pgo-configs/backrest-job.json
@@ -12,7 +12,6 @@
                 }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "{{.JobName}}",
@@ -75,7 +74,7 @@
                         }
                     }]
                 }],
-                "restartPolicy": "OnFailure"
+                "restartPolicy": "Never"
             }
         }
     }
diff --git a/installers/ansible/roles/pgo-operator/files/pgo-configs/backrest-restore-job.json b/installers/ansible/roles/pgo-operator/files/pgo-configs/backrest-restore-job.json
@@ -12,7 +12,6 @@
                 }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "{{.JobName}}",
diff --git a/installers/ansible/roles/pgo-operator/files/pgo-configs/pgdump-job.json b/installers/ansible/roles/pgo-operator/files/pgo-configs/pgdump-job.json
@@ -11,7 +11,6 @@
         }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "{{.JobName}}",
diff --git a/installers/ansible/roles/pgo-operator/files/pgo-configs/pgo.load-template.json b/installers/ansible/roles/pgo-operator/files/pgo-configs/pgo.load-template.json
@@ -5,7 +5,6 @@
         "name": "{{.Name}}"
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "{{.Name}}",
diff --git a/installers/ansible/roles/pgo-operator/files/pgo-configs/pgo.sqlrunner-template.json b/installers/ansible/roles/pgo-operator/files/pgo-configs/pgo.sqlrunner-template.json
@@ -10,7 +10,6 @@
         }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "{{.JobName}}",
diff --git a/installers/ansible/roles/pgo-operator/files/pgo-configs/rmdata-job.json b/installers/ansible/roles/pgo-operator/files/pgo-configs/rmdata-job.json
@@ -10,7 +10,6 @@
         }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "{{.JobName}}",
diff --git a/installers/gcp-marketplace/install-job.yaml b/installers/gcp-marketplace/install-job.yaml
@@ -5,7 +5,6 @@ metadata:
   labels:
     app.kubernetes.io/name: '${OPERATOR_NAME}'
 spec:
-  backoffLimit: 0
   template:
     spec:
       serviceAccountName: '${INSTALLER_SERVICE_ACCOUNT}'
diff --git a/installers/method/ansible-playbook/roles/pgo-installer/templates/pgo-installer-job.json.j2 b/installers/method/ansible-playbook/roles/pgo-installer/templates/pgo-installer-job.json.j2
@@ -9,7 +9,6 @@
         }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "pgo-installer",
@@ -56,4 +55,3 @@
         }
     }
 }
-
diff --git a/installers/method/ansible-playbook/roles/pgo-installer/templates/pgo-uninstaller-job.json.j2 b/installers/method/ansible-playbook/roles/pgo-installer/templates/pgo-uninstaller-job.json.j2
@@ -9,7 +9,6 @@
         }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "pgo-uninstaller",
@@ -56,4 +55,3 @@
         }
     }
 }
-
diff --git a/installers/method/ansible-playbook/roles/pgo-installer/templates/pgo-update-job.json.j2 b/installers/method/ansible-playbook/roles/pgo-installer/templates/pgo-update-job.json.j2
@@ -9,7 +9,6 @@
         }
     },
     "spec": {
-        "backoffLimit": 0,
         "template": {
             "metadata": {
                 "name": "pgo-update",
@@ -56,4 +55,3 @@
         }
     }
 }
-
diff --git a/operator/cluster/clone.go b/operator/cluster/clone.go
@@ -506,8 +506,6 @@ func createPgBackRestRepoSyncJob(clientset *kubernetes.Clientset, namespace stri
 			podSecurityContext.SupplementalGroups = []int64{int64(supplementalGroup)}
 		}
 	}
-	// set the backoff limit to be 0 to match our other jobs
-	backoffLimit := int32(0)
 	// set up the job template to synchronize the pgBackRest repo
 	job := batch_v1.Job{
 		ObjectMeta: meta_v1.ObjectMeta{
@@ -530,7 +528,6 @@ func createPgBackRestRepoSyncJob(clientset *kubernetes.Clientset, namespace stri
 			},
 		},
 		Spec: batch_v1.JobSpec{
-			BackoffLimit: &backoffLimit,
 			Template: v1.PodTemplateSpec{
 				ObjectMeta: meta_v1.ObjectMeta{
 					Name: jobName,

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`}`
`13`	`13`	`},`
`14`	`14`	`"spec": {`
`15`		`- "backoffLimit": 0,`
`16`	`15`	`"template": {`
`17`	`16`	`"metadata": {`
`18`	`17`	`"name": "{{.JobName}}",`
`@@ -75,7 +74,7 @@`
`75`	`74`	`}`
`76`	`75`	`}]`
`77`	`76`	`}],`
`78`		`- "restartPolicy": "OnFailure"`
	`77`	`+ "restartPolicy": "Never"`
`79`	`78`	`}`
`80`	`79`	`}`
`81`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`}`
`12`	`12`	`},`
`13`	`13`	`"spec": {`
`14`		`- "backoffLimit": 0,`
`15`	`14`	`"template": {`
`16`	`15`	`"metadata": {`
`17`	`16`	`"name": "{{.JobName}}",`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`"spec": {`
`13`		`- "backoffLimit": 0,`
`14`	`13`	`"template": {`
`15`	`14`	`"metadata": {`
`16`	`15`	`"name": "{{.JobName}}",`