HomeMesosphereNo notifications. 4 unresolved issues.
  • Search
Differential D821

Fix serialization of POD containers' Docker pull configs
ClosedAll Users
Actions

Authored by ichernetsky on Jun 1 2017, 6:04 AM.

Details

Reviewers
timcharper
zen-dog
kensipe
unterstein
jdef
jenkins
Commits
rMARATHONf3bfa6e88703: Fix serialization of POD containers' Docker pull configs
JIRA Issues
JIRA MARATHON-7090 UCR Authentication per task / docker registry
Test Plan

sbt test

Diff Detail

Repository
rMARATHON marathon
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
ichernetsky created this revision.Jun 1 2017, 6:04 AM
jenkins accepted this revision.Jun 1 2017, 6:26 AM
This revision is now accepted and ready to land.Jun 1 2017, 6:26 AM
jenkins added a comment.Jun 1 2017, 6:26 AM

✔ Build of 3384 completed jenkins-public-marathon-phabricator-142.

You can create a DC/OS with your patched Marathon by creating a new pull
request with the following changes in buildinfo.json:

"url": "https://downloads.mesosphere.io/marathon/snapshots/marathon-1.5.0-SNAPSHOT-552-gb97782c.tgz",
"sha1"" "935f30e0619624caafdd8115f0cf7b9eaa14e120"
jdef accepted this revision.Jun 1 2017, 2:30 PM
kensipe accepted this revision.Jun 2 2017, 5:17 PM
Closed by commit rMARATHONf3bfa6e88703: Fix serialization of POD containers' Docker pull configs (authored by ichernetsky). · Explain WhyJun 2 2017, 5:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 3406

View Options

src/main/scala/mesosphere/mesos/TaskGroupBuilder.scala

11package mesosphere.mesos
22
33import com.typesafe.scalalogging.StrictLogging
4import mesosphere.marathon.api.serialization.SecretSerializer
45import mesosphere.marathon.core.health.{ MesosCommandHealthCheck, MesosHealthCheck }
56import mesosphere.marathon.core.instance.Instance
67import mesosphere.marathon.core.pod._
78import mesosphere.marathon.core.task.Task
89import mesosphere.marathon.plugin.task.RunSpecTaskProcessor
910import mesosphere.marathon.raml
1011import mesosphere.marathon.raml.Endpoint
1112import mesosphere.marathon.state.{ EnvVarString, PathId, PortAssignment, Timestamp }
▲ Show 20 Lines • Show All 336 Lines • ▼ Show 20 Line(s)
348349 container.image.foreach { im =>
349350 val image = mesos.Image.newBuilder
350351
351352 im.forcePull.foreach(forcePull => image.setCached(!forcePull))
352353
353354 im.kind match {
354355 case raml.ImageType.Docker =>
355356 val docker = mesos.Image.Docker.newBuilder.setName(im.id)
356
357 im.pullConfig.foreach { pullConfig =>
358 docker.setConfig(SecretSerializer.toSecretReference(pullConfig.secret))
359 }
357360 image.setType(mesos.Image.Type.DOCKER).setDocker(docker)
358361 case raml.ImageType.Appc =>
359362 val appcLabels = (LinuxAmd64 ++ im.labels).toMesosLabels
360363 val appc = mesos.Image.Appc.newBuilder.setName(im.id).setLabels(appcLabels)
361364 image.setType(mesos.Image.Type.APPC).setAppc(appc)
362365 }
363366
364367 val mesosInfo = mesos.ContainerInfo.MesosInfo.newBuilder.setImage(image)
▲ Show 20 Lines • Show All 110 Lines • Show Last 20 Lines
View Options

src/test/scala/mesosphere/mesos/TaskGroupBuilderTest.scala

Show First 20 Lines • Show All 519 Lines • ▼ Show 20 Line(s)
520520 assert(appcImageLabels == TaskGroupBuilder.LinuxAmd64 ++ Map("foo" -> "bla"))
521521
522522 val task3 = taskGroupInfo
523523 .getTasksList.find(_.getName == "Foo3").get
524524
525525 assert(!task3.hasContainer)
526526 }
527527
528 "create a pod of one container with Docker pull config" in {
529 val offer = MarathonTestHelper.makeBasicOffer(cpus = 6.1, mem = 1568.0, disk = 10.0).build
530
531 val podSpec = PodDefinition(
532 id = "/product/frontend".toPath,
533 containers = Seq(
534 MesosContainer(
535 name = "Foo1",
536 resources = raml.Resources(cpus = 2.0f, mem = 512.0f),
537 image = Some(
538 raml.Image(
539 kind = raml.ImageType.Docker,
540 id = "alpine",
541 pullConfig = Some(raml.DockerPullConfig("aSecret")),
542 forcePull = Some(true)
543 ))
544 )))
545
546 val resourceMatch = RunSpecOfferMatcher.matchOffer(podSpec, offer, Seq.empty, defaultBuilderConfig.acceptedResourceRoles)
547
548 val (_, taskGroupInfo, _, _) = TaskGroupBuilder.build(
549 podSpec,
550 offer,
551 s => Instance.Id.forRunSpec(s),
552 defaultBuilderConfig,
553 RunSpecTaskProcessor.empty,
554 resourceMatch.asInstanceOf[ResourceMatchResponse.Match].resourceMatch
555 )
556
557 assert(taskGroupInfo.getTasksCount == 1)
558
559 val taskContainer = taskGroupInfo
560 .getTasksList.find(_.getName == "Foo1").get.getContainer
561
562 assert(taskContainer.getType == mesos.ContainerInfo.Type.MESOS)
563 assert(taskContainer.getMesos.getImage.getType == mesos.Image.Type.DOCKER)
564 assert(taskContainer.getMesos.getImage.getDocker.getName == "alpine")
565 assert(taskContainer.getMesos.getImage.getDocker.getConfig.getType == mesos.Secret.Type.REFERENCE)
566 assert(taskContainer.getMesos.getImage.getDocker.getConfig.getReference.getName == "aSecret")
567 assert(!taskContainer.getMesos.getImage.getCached)
568 }
569
528570 "create health check definitions with host-mode networking" in {
529571 val offer = MarathonTestHelper.makeBasicOffer(cpus = 3.1, mem = 416.0, disk = 10.0, beginPort = 1200, endPort = 1300).build
530572
531573 val podSpec = PodDefinition(
532574 id = "/product/frontend".toPath,
533575 networks = Seq(HostNetwork),
534576 containers = Seq(
535577 MesosContainer(
▲ Show 20 Lines • Show All 463 Lines • Show Last 20 Lines