From 7133a372d62dddb034c3353eb920ed44f9c0c6ac Mon Sep 17 00:00:00 2001 From: Sargun Dhillon Date: Tue, 3 Sep 2019 10:43:37 -0700 Subject: [PATCH] Mark current linting errors as non-errors This is basically claiming linting bankruptcy. It marks all of the issues we had up until this point as nolint. --- cmd/virtual-kubelet/internal/commands/root/flag.go | 2 +- cmd/virtual-kubelet/internal/provider/mock/mock.go | 11 ++++++----- cmd/virtual-kubelet/register.go | 4 ++-- node/api/helpers.go | 2 +- node/api/pods.go | 2 +- node/node.go | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cmd/virtual-kubelet/internal/commands/root/flag.go b/cmd/virtual-kubelet/internal/commands/root/flag.go index 6c567c226..6736f3925 100644 --- a/cmd/virtual-kubelet/internal/commands/root/flag.go +++ b/cmd/virtual-kubelet/internal/commands/root/flag.go @@ -69,7 +69,7 @@ func installFlags(flags *pflag.FlagSet, c *Opts) { flags.StringVar(&c.TaintKey, "taint", c.TaintKey, "Set node taint key") flags.BoolVar(&c.DisableTaint, "disable-taint", c.DisableTaint, "disable the virtual-kubelet node taint") - flags.MarkDeprecated("taint", "Taint key should now be configured using the VK_TAINT_KEY environment variable") + flags.MarkDeprecated("taint", "Taint key should now be configured using the VK_TAINT_KEY environment variable") //nolint:errcheck flags.IntVar(&c.PodSyncWorkers, "pod-sync-workers", c.PodSyncWorkers, `set the number of pod synchronization workers`) flags.BoolVar(&c.EnableNodeLease, "enable-node-lease", c.EnableNodeLease, `use node leases (1.13) for node heartbeats`) diff --git a/cmd/virtual-kubelet/internal/provider/mock/mock.go b/cmd/virtual-kubelet/internal/provider/mock/mock.go index 65e7c28b6..48b9e8322 100644 --- a/cmd/virtual-kubelet/internal/provider/mock/mock.go +++ b/cmd/virtual-kubelet/internal/provider/mock/mock.go @@ -42,7 +42,7 @@ var ( */ // MockV0Provider implements the virtual-kubelet provider interface and stores pods in memory. -type MockV0Provider struct { +type MockV0Provider struct { //nolint:golint nodeName string operatingSystem string internalIP string @@ -54,12 +54,12 @@ type MockV0Provider struct { } // MockProvider is like MockV0Provider, but implements the PodNotifier interface -type MockProvider struct { +type MockProvider struct { //nolint:golint *MockV0Provider } // MockConfig contains a mock virtual-kubelet's configurable parameters. -type MockConfig struct { +type MockConfig struct { //nolint:golint CPU string `json:"cpu,omitempty"` Memory string `json:"memory,omitempty"` Pods string `json:"pods,omitempty"` @@ -355,7 +355,7 @@ func (p *MockV0Provider) GetPods(ctx context.Context) ([]*v1.Pod, error) { } func (p *MockV0Provider) ConfigureNode(ctx context.Context, n *v1.Node) { - ctx, span := trace.StartSpan(ctx, "mock.ConfigureNode") + ctx, span := trace.StartSpan(ctx, "mock.ConfigureNode") //nolint:ineffassign defer span.End() n.Status.Capacity = p.capacity() @@ -453,7 +453,8 @@ func (p *MockV0Provider) nodeDaemonEndpoints() v1.NodeDaemonEndpoints { // GetStatsSummary returns dummy stats for all pods known by this provider. func (p *MockV0Provider) GetStatsSummary(ctx context.Context) (*stats.Summary, error) { - ctx, span := trace.StartSpan(ctx, "GetStatsSummary") + var span trace.Span + ctx, span = trace.StartSpan(ctx, "GetStatsSummary") //nolint: ineffassign defer span.End() // Grab the current timestamp so we can report it as the time the stats were generated. diff --git a/cmd/virtual-kubelet/register.go b/cmd/virtual-kubelet/register.go index 2d1eb16ec..e845e5642 100644 --- a/cmd/virtual-kubelet/register.go +++ b/cmd/virtual-kubelet/register.go @@ -6,7 +6,7 @@ import ( ) func registerMock(s *provider.Store) { - s.Register("mock", func(cfg provider.InitConfig) (provider.Provider, error) { + s.Register("mock", func(cfg provider.InitConfig) (provider.Provider, error) { //nolint:errcheck return mock.NewMockProvider( cfg.ConfigPath, cfg.NodeName, @@ -16,7 +16,7 @@ func registerMock(s *provider.Store) { ) }) - s.Register("mockV0", func(cfg provider.InitConfig) (provider.Provider, error) { + s.Register("mockV0", func(cfg provider.InitConfig) (provider.Provider, error) { //nolint:errcheck return mock.NewMockProvider( cfg.ConfigPath, cfg.NodeName, diff --git a/node/api/helpers.go b/node/api/helpers.go index 9f32d01e2..1af574d23 100644 --- a/node/api/helpers.go +++ b/node/api/helpers.go @@ -33,7 +33,7 @@ func handleError(f handlerFunc) http.HandlerFunc { code := httpStatusCode(err) w.WriteHeader(code) - io.WriteString(w, err.Error()) + io.WriteString(w, err.Error()) //nolint:errcheck logger := log.G(req.Context()).WithError(err).WithField("httpStatusCode", code) if code >= 500 { diff --git a/node/api/pods.go b/node/api/pods.go index 7d2ca65d5..071220505 100644 --- a/node/api/pods.go +++ b/node/api/pods.go @@ -28,7 +28,7 @@ type PodListerFunc func(context.Context) ([]*v1.Pod, error) func HandleRunningPods(getPods PodListerFunc) http.HandlerFunc { scheme := runtime.NewScheme() - v1.SchemeBuilder.AddToScheme(scheme) + v1.SchemeBuilder.AddToScheme(scheme) //nolint:errcheck codecs := serializer.NewCodecFactory(scheme) return handleError(func(w http.ResponseWriter, req *http.Request) error { diff --git a/node/node.go b/node/node.go index 91ed23af0..59ce9d674 100644 --- a/node/node.go +++ b/node/node.go @@ -38,7 +38,7 @@ import ( // // Note: Implementers can choose to manage a node themselves, in which case // it is not needed to provide an implementation for this interface. -type NodeProvider interface { +type NodeProvider interface { //nolint:golint // Ping checks if the node is still active. // This is intended to be lightweight as it will be called periodically as a // heartbeat to keep the node marked as ready in Kubernetes.