From 161abf8f5b5700dd838f23bbfd6520e893a70126 Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Thu, 19 Sep 2019 09:31:36 -0400 Subject: [PATCH] Fix golangci-lint findings Signed-off-by: Phil Estes --- pkg/containerd/opts/spec_unix.go | 6 +++--- pkg/containerd/opts/spec_windows.go | 4 ++-- pkg/netns/netns_windows.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/containerd/opts/spec_unix.go b/pkg/containerd/opts/spec_unix.go index ef0b20269..c17fb4469 100644 --- a/pkg/containerd/opts/spec_unix.go +++ b/pkg/containerd/opts/spec_unix.go @@ -124,7 +124,7 @@ func WithMounts(osi osinterface.OS, config *runtime.ContainerConfig, extra []*ru criMounts = config.GetMounts() mounts = append([]*runtime.Mount{}, criMounts...) ) - // Copy all mounts from extra mounts, except for mounts overriden by CRI. + // Copy all mounts from extra mounts, except for mounts overridden by CRI. for _, e := range extra { found := false for _, c := range criMounts { @@ -151,7 +151,7 @@ func WithMounts(osi osinterface.OS, config *runtime.ContainerConfig, extra []*ru }) // Copy all mounts from default mounts, except for - // - mounts overriden by supplied mount; + // - mounts overridden by supplied mount; // - all mounts under /dev if a supplied /dev is present. mountSet := make(map[string]struct{}) for _, m := range mounts { @@ -202,7 +202,7 @@ func WithMounts(osi osinterface.OS, config *runtime.ContainerConfig, extra []*ru switch mount.GetPropagation() { case runtime.MountPropagation_PROPAGATION_PRIVATE: options = append(options, "rprivate") - // Since default root propogation in runc is rprivate ignore + // Since default root propagation in runc is rprivate ignore // setting the root propagation case runtime.MountPropagation_PROPAGATION_BIDIRECTIONAL: if err := ensureShared(src, osi.(osinterface.UNIX).LookupMount); err != nil { diff --git a/pkg/containerd/opts/spec_windows.go b/pkg/containerd/opts/spec_windows.go index cbee12a1b..33d28183d 100644 --- a/pkg/containerd/opts/spec_windows.go +++ b/pkg/containerd/opts/spec_windows.go @@ -58,7 +58,7 @@ func WithWindowsMounts(osi osinterface.OS, config *runtime.ContainerConfig, extr criMounts = config.GetMounts() mounts = append([]*runtime.Mount{}, criMounts...) ) - // Copy all mounts from extra mounts, except for mounts overriden by CRI. + // Copy all mounts from extra mounts, except for mounts overridden by CRI. for _, e := range extra { found := false for _, c := range criMounts { @@ -77,7 +77,7 @@ func WithWindowsMounts(osi osinterface.OS, config *runtime.ContainerConfig, extr sort.Sort(orderedMounts(mounts)) // Copy all mounts from default mounts, except for - // - mounts overriden by supplied mount; + // - mounts overridden by supplied mount; // - all mounts under /dev if a supplied /dev is present. mountSet := make(map[string]struct{}) for _, m := range mounts { diff --git a/pkg/netns/netns_windows.go b/pkg/netns/netns_windows.go index 994cd1157..59bb5a8ee 100644 --- a/pkg/netns/netns_windows.go +++ b/pkg/netns/netns_windows.go @@ -33,7 +33,7 @@ func NewNetNS() (*NetNS, error) { return nil, err } - return &NetNS{path: string(hcnNamespace.Id)}, nil + return &NetNS{path: hcnNamespace.Id}, nil } // LoadNetNS loads existing network namespace.