diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-13 17:59:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 17:59:58 +0100 |
| commit | e83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc (patch) | |
| tree | 190410369b4bcbd12891fcfc1ecbe5bb21ea4050 /libpod | |
| parent | 9e2e4d7615311b38b1e553af32a5666888ef3c96 (diff) | |
| parent | 4093b2c0111369f9590d803c53a40b79ae2fd1dd (diff) | |
| download | podman-e83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc.tar.gz podman-e83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc.tar.bz2 podman-e83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc.zip | |
Merge pull request #4817 from rhatdan/codespell
Add codespell to validate spelling mistakes in code.
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/image/image.go | 2 | ||||
| -rw-r--r-- | libpod/kube.go | 8 | ||||
| -rw-r--r-- | libpod/networking_linux.go | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go index 84da21ce5..503282156 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -1528,7 +1528,7 @@ func GetLayersMapWithImageInfo(imageruntime *Runtime) (map[string]*LayerInfo, er } } - // scan all layers & add all childs for each layers to layerInfo + // scan all layers & add all childid's for each layers to layerInfo for _, layer := range layers { _, ok := layerInfoMap[layer.ID] if ok { diff --git a/libpod/kube.go b/libpod/kube.go index 6ae3e3d07..e0f79ac11 100644 --- a/libpod/kube.go +++ b/libpod/kube.go @@ -310,13 +310,13 @@ func ocicniPortMappingToContainerPort(portMappings []ocicni.PortMapping) ([]v1.C func libpodEnvVarsToKubeEnvVars(envs []string) ([]v1.EnvVar, error) { var envVars []v1.EnvVar for _, e := range envs { - splitE := strings.SplitN(e, "=", 2) - if len(splitE) != 2 { + split := strings.SplitN(e, "=", 2) + if len(split) != 2 { return envVars, errors.Errorf("environment variable %s is malformed; should be key=value", e) } ev := v1.EnvVar{ - Name: splitE[0], - Value: splitE[1], + Name: split[0], + Value: split[1], } envVars = append(envVars, ev) } diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 89dac2b5d..5db749a4d 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -255,7 +255,7 @@ func (r *Runtime) setupRootlessNetNS(ctr *Container) (err error) { } defer func() { if err := cmd.Process.Release(); err != nil { - logrus.Errorf("unable to release comman process: %q", err) + logrus.Errorf("unable to release command process: %q", err) } }() |