github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 13:14:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20896 from kinvolk/ckuehl/replace-rocket-with-rkt

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-09 16:05:01 -08:00
parent 2ec49efd54 7fcc40bb27
commit d7bef3cc87
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/proposals/selinux.md
View File

@@ -74,9 +74,9 @@ use-cases:
We should avoid using the `:z` flag, because it relaxes the SELinux context so that any container
(from an SELinux standpoint) can use the volume.
### Rocket
### rkt
Rocket currently reads the base SELinux context to use from `/etc/selinux/*/contexts/lxc_contexts`
rkt currently reads the base SELinux context to use from `/etc/selinux/*/contexts/lxc_contexts`
and allocates a unique MCS label per pod.
### Kubernetes

8
docs/proposals/volumes.md
View File

@@ -90,15 +90,15 @@ There is a [proposal](https://github.com/docker/docker/pull/14632) to add a bind
Docker to change the ownership of a volume to the effective UID and GID of a container, but this has
not yet been accepted.
### Rocket
### rkt
Rocket
rkt
[image manifests](https://github.com/appc/spec/blob/master/spec/aci.md#image-manifest-schema) can
specify users and groups, similarly to how a Docker image can. A Rocket
specify users and groups, similarly to how a Docker image can. A rkt
[pod manifest](https://github.com/appc/spec/blob/master/spec/pods.md#pod-manifest-schema) can also
override the default user and group specified by the image manifest.
Rocket does not currently support supplemental groups or changing the owning UID or
rkt does not currently support supplemental groups or changing the owning UID or
group of a volume, but it has been [requested](https://github.com/coreos/rkt/issues/1309).
## Use Cases