Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add topologySpreadConstraints to Pod spec #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doriordan merged 2 commits into from
Feb 28, 2025
Merged

Add topologySpreadConstraints to Pod spec #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1ca18c
add topologySpreadConstraints to Pod spec
Feb 28, 2025
0b9a2d1
remove release version change
Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions client/src/main/scala/skuber/Pod.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ object Pod {
imagePullSecrets: List[LocalObjectReference] = List(),
affinity: Option[Affinity] = None,
tolerations: List[Toleration] = List(),
topologySpreadConstraints: List[TopologySpreadConstraints] = List(),
securityContext: Option[PodSecurityContext] = None,
hostname: Option[String] = None,
hostAliases: List[HostAlias] = Nil,
Expand Down Expand Up @@ -153,6 +154,12 @@ object Pod {
case class DNSConfigOption(name: String, value: String)
case class DNSConfig(nameservers: List[String] = Nil, options: List[DNSConfigOption] = Nil, searches: List[String] = Nil)

case class TopologySpreadConstraints(
maxSkew: Int,
topologyKey: String,
whenUnsatisfiable: String,
labelSelector: Option[LabelSelector] = None)

case class Status(
phase: Option[Phase.Phase] = None,
conditions: List[Condition] = Nil,
Expand Down
22 changes: 17 additions & 5 deletions client/src/main/scala/skuber/json/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package skuber.json
import scala.language.implicitConversions
import java.time._
import java.time.format._

import org.apache.commons.codec.binary.Base64
import play.api.libs.functional.syntax._
import play.api.libs.json._
import skuber.Pod.TopologySpreadConstraints
import skuber.Volume.{ConfigMapVolumeSource, KeyToPath}
import skuber._
import skuber.annotation.MatchExpression
Expand Down Expand Up @@ -251,6 +251,16 @@ package object format {

implicit val secCtxtFormat: Format[SecurityContext] = Json.format[SecurityContext]

implicit val labelSelectorForrmat: Format[LabelSelector] = (
(JsPath \ "matchLabels").formatNullable[Map[String, String]] and
(JsPath \ "matchExpressions").formatNullable[List[SelMatchExpression]]
)(OnTheWireSelector.apply _, unlift(OnTheWireSelector.unapply)).inmap[LabelSelector](
otwSelectorToLabelSelector,
labelSelToOtwSelector
)

implicit val topologySpreadConstraintsFormat: Format[TopologySpreadConstraints] = Json.format[TopologySpreadConstraints]

implicit val podSecCtxtFormat: Format[PodSecurityContext] = (
(JsPath \ "fsGroup").formatNullable[Int] and
(JsPath \ "runAsGroup").formatNullable[Int] and
Expand Down Expand Up @@ -807,7 +817,7 @@ package object format {
// which has finally necessitated a hack to get around Play Json limitations supporting case classes with > 22 members
// (see e.g. https://stackoverflow.com/questions/28167971/scala-case-having-22-fields-but-having-issue-with-play-json-in-scala-2-11-5)

val podSpecPartOneFormat: OFormat[(List[Container], List[Container], List[Volume], skuber.RestartPolicy.Value, Option[Int], Option[Int], skuber.DNSPolicy.Value, Map[String, String], String, String, Boolean, List[LocalObjectReference], Option[Pod.Affinity], List[Pod.Toleration], Option[PodSecurityContext])] = (
val podSpecPartOneFormat: OFormat[(List[Container], List[Container], List[Volume], skuber.RestartPolicy.Value, Option[Int], Option[Int], skuber.DNSPolicy.Value, Map[String, String], String, String, Boolean, List[LocalObjectReference], Option[Pod.Affinity], List[Pod.Toleration], List[TopologySpreadConstraints], Option[PodSecurityContext])] = (
(JsPath \ "containers").format[List[Container]] and
(JsPath \ "initContainers").formatMaybeEmptyList[Container] and
(JsPath \ "volumes").formatMaybeEmptyList[Volume] and
Expand All @@ -822,6 +832,7 @@ package object format {
(JsPath \ "imagePullSecrets").formatMaybeEmptyList[LocalObjectReference] and
(JsPath \ "affinity").formatNullable[Pod.Affinity] and
(JsPath \ "tolerations").formatMaybeEmptyList[Pod.Toleration] and
(JsPath \ "topologySpreadConstraints").formatMaybeEmptyList[TopologySpreadConstraints] and
(JsPath \ "securityContext").formatNullable[PodSecurityContext]
).tupled

Expand All @@ -840,13 +851,13 @@ package object format {
).tupled

def fromTuples(
partOne: (scala.List[Container], scala.List[Container], scala.List[Volume], skuber.RestartPolicy.Value, Option[Int], Option[Int], skuber.DNSPolicy.Value, Map[String, String], String, String, Boolean, scala.List[skuber.LocalObjectReference], Option[Pod.Affinity], scala.List[Pod.Toleration], Option[PodSecurityContext]),
partOne: (scala.List[Container], scala.List[Container], scala.List[Volume], skuber.RestartPolicy.Value, Option[Int], Option[Int], skuber.DNSPolicy.Value, Map[String, String], String, String, Boolean, scala.List[skuber.LocalObjectReference], Option[Pod.Affinity], scala.List[Pod.Toleration], List[TopologySpreadConstraints], Option[PodSecurityContext]),
partTwo: (Option[String], scala.List[Pod.HostAlias], Option[Boolean], Option[Boolean], Option[Boolean], Option[Int], Option[String], Option[String], Option[String], Option[Pod.DNSConfig], Option[Boolean])
): Pod.Spec = {
val (conts, initConts, vols, rpol, tgps, adls, dnspol, nodesel, svcac, node, hnet, ips, aff, tol, psc) = partOne
val (conts, initConts, vols, rpol, tgps, adls, dnspol, nodesel, svcac, node, hnet, ips, aff, tol, tsc, psc) = partOne
val (host, aliases, pid, ipc, asat, prio, prioc, sched, subd, dnsc, spn) = partTwo

Pod.Spec(conts, initConts, vols, rpol, tgps, adls, dnspol, nodesel, svcac, node, hnet, ips, aff, tol, psc, host, aliases, pid, ipc, asat, prio, prioc, sched, subd, dnsc, spn)
Pod.Spec(conts, initConts, vols, rpol, tgps, adls, dnspol, nodesel, svcac, node, hnet, ips, aff, tol, tsc, psc, host, aliases, pid, ipc, asat, prio, prioc, sched, subd, dnsc, spn)
}

implicit val podSpecFmt: Format[Pod.Spec] = (
Expand All @@ -868,6 +879,7 @@ package object format {
s.imagePullSecrets,
s.affinity,
s.tolerations,
s.topologySpreadConstraints,
s.securityContext
),
( s.hostname,
Expand Down