Fix rkt mounts and add arbitrary volume mounting #1812
Conversation
|
|
||
| // rktVolumesConfigOption is the key for enabling the use of custom | ||
| // bind volumes. | ||
| rktVolumesConfigOption = "rkt.volumes.enabled" |
There was a problem hiding this comment.
Is this documented on the website? Plus the docker option
| cmdArgs = append(cmdArgs, fmt.Sprintf("--mount=volume=%s,target=%s", task.Name, ctx.AllocDir.SharedDir)) | ||
|
|
||
| // Mount /alloc | ||
| cmdArgs = append(cmdArgs, fmt.Sprintf("--volume=%salloc,kind=host,source=%s", task.Name, ctx.AllocDir.SharedDir)) |
There was a problem hiding this comment.
I feel like we should be using file path.Join and using the constants
There was a problem hiding this comment.
To generate the source=%s path? Won't that just be reimplementing what's in ctx.AllocDir.SharedDir?
There was a problem hiding this comment.
Fixed the unique volume names.
schmichael
force-pushed
the
f-rkt-volumes
branch
from
827e8b5 to
a5c13e1
Compare
| @@ -9,6 +9,7 @@ IMPROVEMENTS: | |||
| * client: Introduce a `secrets/` directory to tasks where sensitive data can | |||
| be written [GH-1681] | |||
| * driver: Export `NOMAD_JOB_NAME` environment variable [GH-1804] | |||
| * driver/rkt: Support rkt volumes (rkt >= 1.0.0 required) [GH-1812] | |||
There was a problem hiding this comment.
Lexicographical ordering, rkt after docker
|
|
||
| // Mount arbitrary volumes if enabled | ||
| if len(driverConfig.Volumes) > 0 { | ||
| if enabled := d.config.ReadBoolDefault(rktVolumesConfigOption, false); !enabled { |
| ## Task Directories | ||
| * `volumes` - (Optional) A list of `host_path:container_path` strings to bind | ||
| host paths to container paths. Can only be run on clients with the | ||
| `rkt.volumes.enabled` option set to true. |
There was a problem hiding this comment.
The wording should slightly change based on changing the default
| @@ -141,7 +149,7 @@ func (d *RktDriver) Fingerprint(cfg *config.Config, node *structs.Node) (bool, e | |||
| return false, nil | |||
| } | |||
|
|
|||
| outBytes, err := exec.Command("rkt", "version").Output() | |||
| outBytes, err := exec.Command(rktCmd, "version").Output() | |||
There was a problem hiding this comment.
Add rktVolumesConfigOption to the attributes during fingerprinting
schmichael
force-pushed
the
f-rkt-volumes
branch
from
c4fd186 to
31a8149
Compare
Make section names match between docker and rkt
Fix rkt docs and custom volume mounting
schmichael
force-pushed
the
f-rkt-volumes
branch
from
dc1dabe to
5357579
Compare
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
Just like #1767 did for the docker driver.