Add support in job spec for backoffLimit (#143)

doriordan · May 11, 2018 · bfd29f8 · bfd29f8
1 parent 61a199e
commit bfd29f8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/client/src/main/scala/skuber/batch/Job.scala b/client/src/main/scala/skuber/batch/Job.scala
@@ -40,7 +40,8 @@ object Job {
                   activeDeadlineSeconds: Option[Long] = None,
                   selector: Option[LabelSelector] = None,
                   manualSelector: Option[Boolean] = None,
-                  template: Option[Pod.Template.Spec] = None)
+                  template: Option[Pod.Template.Spec] = None,
+                  backoffLimit: Option[Int] = None)
 
   case class Status(conditions: Option[Condition] = None,
                     startTime: Option[Timestamp] = None,

diff --git a/client/src/main/scala/skuber/json/batch/format/package.scala b/client/src/main/scala/skuber/json/batch/format/package.scala
@@ -37,7 +37,8 @@ package object format {
       (JsPath \ "activeDeadlineSeconds").formatNullable[Long] and
       (JsPath \ "selector").formatNullableLabelSelector and
       (JsPath \ "manualSelector").formatNullable[Boolean] and
-      (JsPath \ "template").formatNullable[Pod.Template.Spec]
+      (JsPath \ "template").formatNullable[Pod.Template.Spec] and
+      (JsPath \ "backoffLimit").formatNullable[Int]
     )(Job.Spec.apply _, unlift(Job.Spec.unapply))
 
   implicit val jobFormat: Format[Job] = (

diff --git a/client/src/test/scala/skuber/batch/JobSpec.scala b/client/src/test/scala/skuber/batch/JobSpec.scala
@@ -58,14 +58,18 @@ class JobSpec extends Specification {
         |				],
         |				"restartPolicy": "Never"
         |			}
-        |		}
+        |		},
+        |  "backoffLimit": 4,
+        |  "activeDeadlineSeconds": 60
         |	}
         |}
       """.stripMargin
 
     val job = Json.parse(jobJsonStr).as[Job]
     job.kind mustEqual "Job"
     job.name mustEqual "pi"
+    job.spec.get.activeDeadlineSeconds mustEqual Some(60)
+    job.spec.get.backoffLimit mustEqual Some(4)
     val templateSpec: Template.Spec = job.spec.get.template.get
     templateSpec.metadata.name mustEqual "templatename"
     templateSpec.spec.get.restartPolicy mustEqual RestartPolicy.Never

diff --git a/client/src/test/scala/skuber/json/NodeFormatSpec.scala b/client/src/test/scala/skuber/json/NodeFormatSpec.scala
@@ -15,8 +15,6 @@ import play.api.libs.json._
 
 import scala.io.Source
 
-
-
 /**
  * @author David O'Riordan
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,8 +15,6 @@ import play.api.libs.json._ @@
     import scala.io.Source
     /**
      * @author David O'Riordan
      */
@@ Expand Down @@