diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2021-08-12 07:22:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 07:22:48 +0000 |
| commit | de043a5a029d4d03b91f8b88ca8cee7d71dcdeed (patch) | |
| tree | 11793798c376c07e4c582c8a976eae4133553070 /libpod | |
| parent | 25ff04dcbe3212db6f72d08f3f904154bab4c0fe (diff) | |
| parent | 404488a0879c84de523adeacb78c6b898a7e52c8 (diff) | |
| download | podman-de043a5a029d4d03b91f8b88ca8cee7d71dcdeed.tar.gz podman-de043a5a029d4d03b91f8b88ca8cee7d71dcdeed.tar.bz2 podman-de043a5a029d4d03b91f8b88ca8cee7d71dcdeed.zip | |
Merge pull request #11203 from rhatdan/codespell
Run codespell to fix spelling
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container.go | 2 | ||||
| -rw-r--r-- | libpod/container_internal_linux.go | 2 | ||||
| -rw-r--r-- | libpod/container_log_linux.go | 2 | ||||
| -rw-r--r-- | libpod/networking_linux.go | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libpod/container.go b/libpod/container.go index d5d5ef1a5..80fd35c09 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -240,7 +240,7 @@ type ContainerImageVolume struct { type ContainerSecret struct { // Secret is the secret *secrets.Secret - // UID is tbe UID of the secret file + // UID is the UID of the secret file UID uint32 // GID is the GID of the secret file GID uint32 diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 6d2f7bddc..f21aebb09 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -1782,7 +1782,7 @@ func (c *Container) generateResolvConf() (string, error) { cniResponse := c.state.NetworkStatus for _, i := range cniResponse { for _, ip := range i.IPs { - // Note: only using To16() does not work since it also returns a vaild ip for ipv4 + // Note: only using To16() does not work since it also returns a valid ip for ipv4 if ip.Address.IP.To4() == nil && ip.Address.IP.To16() != nil { ipv6 = true } diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go index d4afaa52a..11f1be7f9 100644 --- a/libpod/container_log_linux.go +++ b/libpod/container_log_linux.go @@ -79,7 +79,7 @@ func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOption break } if cursorError != nil { - return errors.Wrap(cursorError, "inital journal cursor") + return errors.Wrap(cursorError, "initial journal cursor") } // We need the container's events in the same journal to guarantee diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 8e9b5997c..17e444f66 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -1219,7 +1219,7 @@ func (c *Container) NetworkDisconnect(nameOrID, netName string, force bool) erro return err } - // OCICNI will set the loopback adpter down on teardown so we should set it up again + // OCICNI will set the loopback adapter down on teardown so we should set it up again err = c.state.NetNS.Do(func(_ ns.NetNS) error { link, err := netlink.LinkByName("lo") if err != nil { @@ -1229,7 +1229,7 @@ func (c *Container) NetworkDisconnect(nameOrID, netName string, force bool) erro return err }) if err != nil { - logrus.Warnf("failed to set loopback adpter up in the container: %v", err) + logrus.Warnf("failed to set loopback adapter up in the container: %v", err) } // Reload ports when there are still connected networks, maybe we removed the network interface with the child ip. // Reloading without connected networks does not make sense, so we can skip this step. |