diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-23 17:38:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 17:38:43 +0100 |
| commit | 54b82a175f16f27849e6791f65bf73eccae4701a (patch) | |
| tree | 063ba11dfe87b045518793cd2a6f1bcfa3926671 /libpod/kube.go | |
| parent | 8544bb57fe5e9222509827a7f5aa648516b9cd98 (diff) | |
| parent | 4fa1fce930f13d71f39b65bad3f46f61d961ab51 (diff) | |
| download | podman-54b82a175f16f27849e6791f65bf73eccae4701a.tar.gz podman-54b82a175f16f27849e6791f65bf73eccae4701a.tar.bz2 podman-54b82a175f16f27849e6791f65bf73eccae4701a.zip | |
Merge pull request #8787 from jsoref/spelling
Spelling
Diffstat (limited to 'libpod/kube.go')
| -rw-r--r-- | libpod/kube.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/kube.go b/libpod/kube.go index bf041112a..753c58099 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -403,7 +403,7 @@ func libpodEnvVarsToKubeEnvVars(envs []string) ([]v1.EnvVar, error) { // libpodMountsToKubeVolumeMounts converts the containers mounts to a struct kube understands func libpodMountsToKubeVolumeMounts(c *Container) ([]v1.VolumeMount, []v1.Volume, error) { - // TjDO when named volumes are supported in play kube, also parse named volumes here + // TODO when named volumes are supported in play kube, also parse named volumes here _, mounts := c.sortUserVolumes(c.config.Spec) vms := make([]v1.VolumeMount, 0, len(mounts)) vos := make([]v1.Volume, 0, len(mounts)) @@ -524,7 +524,7 @@ func capAddDrop(caps *specs.LinuxCapabilities) (*v1.Capabilities, error) { defaultCaps = append(defaultCaps, g.Config.Process.Capabilities.Inheritable...) defaultCaps = append(defaultCaps, g.Config.Process.Capabilities.Permitted...) - // Combine all the container's capabilities into a slic + // Combine all the container's capabilities into a slice containerCaps := append(caps.Ambient, caps.Bounding...) containerCaps = append(containerCaps, caps.Effective...) containerCaps = append(containerCaps, caps.Inheritable...) |