Update modules

assets/licence/overrides

@@ -2,4 +2,8 @@
 {"name": "github.com/newrelic/infra-integrations-sdk", "licenceType": "Apache-2.0"}
 {"name": "github.com/xeipuuv/gojsonschema", "licenceType": "Apache-2.0"}
 {"name": "github.com/xeipuuv/gojsonpointer", "licenceType": "Apache-2.0"}
-{"name": "github.com/xeipuuv/gojsonreference", "licenceType": "Apache-2.0"}
+{"name": "github.com/xeipuuv/gojsonreference", "licenceType": "Apache-2.0"}
+{"name": "github.com/chzyer/logex", "licenceType": "MIT"}
+{"name": "github.com/kr/logfmt", "licenceType": "MIT"}
+{"name": "github.com/munnerz/goautoneg", "licenceType": "BSD-3-Clause License"}
+{"name": "github.com/hashicorp/golang-lru", "licenceType": "MPL-2.0 License"}

assets/licence/rules.json

@@ -17,6 +17,8 @@
       "Ruby",
       "ISC",
       "CC0-1.0",
-      "Zlib"
+      "Zlib",
+      "BSD-3-Clause License",
+      "MPL-2.0 License"
     ]
   }

cmd/kubernetes-discovery/main.go

@@ -4,12 +4,11 @@ import (
 	"flag"
 	"time"
 
-	k8sclient "github.com/newrelic/nri-kubernetes/src/client"
-
-	"github.com/newrelic/nri-kubernetes/src/ksm/client"
-
 	"github.com/newrelic/infra-integrations-sdk/log"
+	"github.com/newrelic/nri-kubernetes/v2/src/ksm/client"
 	"github.com/sirupsen/logrus"
+
+	k8sclient "github.com/newrelic/nri-kubernetes/v2/src/client"
 )
 
 var discovery = flag.String("discovery", KSMPodLabel, "Which discovery mechanism to run")

cmd/kubernetes-static/main.go

@@ -12,17 +12,18 @@ import (
 	sdkArgs "github.com/newrelic/infra-integrations-sdk/args"
 	"github.com/newrelic/infra-integrations-sdk/log"
 	"github.com/newrelic/infra-integrations-sdk/sdk"
-	"github.com/newrelic/nri-kubernetes/src/apiserver"
-	"github.com/newrelic/nri-kubernetes/src/client"
-	"github.com/newrelic/nri-kubernetes/src/controlplane"
-	"github.com/newrelic/nri-kubernetes/src/ksm"
-	"github.com/newrelic/nri-kubernetes/src/kubelet"
-	metric2 "github.com/newrelic/nri-kubernetes/src/kubelet/metric"
-	"github.com/newrelic/nri-kubernetes/src/metric"
-	"github.com/newrelic/nri-kubernetes/src/scrape"
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/version"
+
+	"github.com/newrelic/nri-kubernetes/v2/src/apiserver"
+	"github.com/newrelic/nri-kubernetes/v2/src/client"
+	"github.com/newrelic/nri-kubernetes/v2/src/controlplane"
+	"github.com/newrelic/nri-kubernetes/v2/src/ksm"
+	"github.com/newrelic/nri-kubernetes/v2/src/kubelet"
+	metric2 "github.com/newrelic/nri-kubernetes/v2/src/kubelet/metric"
+	"github.com/newrelic/nri-kubernetes/v2/src/metric"
+	"github.com/newrelic/nri-kubernetes/v2/src/scrape"
 )
 
 const (

e2e/cmd/e2e.go

@@ -20,13 +20,13 @@ import (
 	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/apimachinery/pkg/version"
 
-	_ "github.com/newrelic/nri-kubernetes/e2e/gcp"
-	"github.com/newrelic/nri-kubernetes/e2e/helm"
-	"github.com/newrelic/nri-kubernetes/e2e/jsonschema"
-	"github.com/newrelic/nri-kubernetes/e2e/k8s"
-	"github.com/newrelic/nri-kubernetes/e2e/retry"
-	"github.com/newrelic/nri-kubernetes/e2e/scenario"
-	"github.com/newrelic/nri-kubernetes/e2e/timer"
+	_ "github.com/newrelic/nri-kubernetes/v2/e2e/gcp"
+	"github.com/newrelic/nri-kubernetes/v2/e2e/helm"
+	"github.com/newrelic/nri-kubernetes/v2/e2e/jsonschema"
+	"github.com/newrelic/nri-kubernetes/v2/e2e/k8s"
+	"github.com/newrelic/nri-kubernetes/v2/e2e/retry"
+	"github.com/newrelic/nri-kubernetes/v2/e2e/scenario"
+	"github.com/newrelic/nri-kubernetes/v2/e2e/timer"
 )
 
 var cliArgs = struct {

e2e/helm/helm.go

@@ -8,8 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/newrelic/nri-kubernetes/e2e/timer"
 	"github.com/sirupsen/logrus"
+
+	"github.com/newrelic/nri-kubernetes/v2/e2e/timer"
 )
 
 const _helmBinary = "helm"

e2e/jsonschema/match.go

@@ -2,13 +2,13 @@ package jsonschema
 
 import (
 	"fmt"
-
 	"path/filepath"
 
 	"github.com/newrelic/infra-integrations-sdk/sdk"
-	"github.com/newrelic/nri-kubernetes/e2e/jsonschema/schema"
 	"github.com/pkg/errors"
 	"github.com/xeipuuv/gojsonschema"
+
+	"github.com/newrelic/nri-kubernetes/v2/e2e/jsonschema/schema"
 )
 
 // EventTypeToSchemaFilename maps event types with their json schema.

e2e/jsonschema/match_test.go

@@ -77,7 +77,7 @@ func TestErrorValidatingTestNode(t *testing.T) {
 
 	err = MatchEntities(i.Data, s, "testdata")
 	assert.Contains(t, err.Error(), "test-node:node1-dsn.compute.internal TestNodeSample")
-	assert.Contains(t, err.Error(), "capacity: capacity is required")
+	assert.Contains(t, err.Error(), "(root): capacity is required")
 	assert.Contains(t, err.Error(), "test-node:node2-dsn.compute.internal TestNodeSample")
 	assert.Contains(t, err.Error(), "cpuUsedCores: Invalid type. Expected: number, given: string")
 }

e2e/k8s/api.go

@@ -1,14 +1,13 @@
 package k8s
 
 import (
+	"bytes"
+	"context"
 	"fmt"
 	"os"
 	"path/filepath"
-	"time"
-
-	"bytes"
-
 	"strings"
+	"time"
 
 	v1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
@@ -83,34 +82,34 @@ func (c Client) ServerVersion() string {
 
 // NodesList list nodes.
 func (c Client) NodesList() (*v1.NodeList, error) {
-	return c.Clientset.CoreV1().Nodes().List(metav1.ListOptions{})
+	return c.Clientset.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
 }
 
 // ServiceAccount finds a serviceaccount into the namespace a service account with the given name
 func (c Client) ServiceAccount(namespace, name string) (*v1.ServiceAccount, error) {
-	return c.Clientset.CoreV1().ServiceAccounts(namespace).Get(name, metav1.GetOptions{})
+	return c.Clientset.CoreV1().ServiceAccounts(namespace).Get(context.TODO(), name, metav1.GetOptions{})
 }
 
 // CreateServiceAccount creates a serviceaccount into the namespace a service account with the given name
 func (c Client) CreateServiceAccount(namespace, name string) (*v1.ServiceAccount, error) {
-	return c.Clientset.CoreV1().ServiceAccounts(namespace).Create(&v1.ServiceAccount{
+	return c.Clientset.CoreV1().ServiceAccounts(namespace).Create(context.TODO(), &v1.ServiceAccount{
 		ObjectMeta: metav1.ObjectMeta{Name: name},
-	})
+	}, metav1.CreateOptions{})
 }
 
 // ClusterRoleBinding finds a clusterrolebinding with the given name
 func (c Client) ClusterRoleBinding(name string) (*rbacv1.ClusterRoleBinding, error) {
-	return c.Clientset.RbacV1().ClusterRoleBindings().Get(name, metav1.GetOptions{})
+	return c.Clientset.RbacV1().ClusterRoleBindings().Get(context.TODO(), name, metav1.GetOptions{})
 }
 
 // ClusterRole finds a clusterrole with the given name
 func (c Client) ClusterRole(name string) (*rbacv1.ClusterRole, error) {
-	return c.Clientset.RbacV1().ClusterRoles().Get(name, metav1.GetOptions{})
+	return c.Clientset.RbacV1().ClusterRoles().Get(context.TODO(), name, metav1.GetOptions{})
 }
 
 // CreateClusterRoleBinding creates a clusterrolebinding with the given name and links it with the serviceaccount
 func (c Client) CreateClusterRoleBinding(name string, sa *v1.ServiceAccount, cr *rbacv1.ClusterRole) (*rbacv1.ClusterRoleBinding, error) {
-	return c.Clientset.RbacV1().ClusterRoleBindings().Create(&rbacv1.ClusterRoleBinding{
+	return c.Clientset.RbacV1().ClusterRoleBindings().Create(context.TODO(), &rbacv1.ClusterRoleBinding{
 		ObjectMeta: metav1.ObjectMeta{Name: name},
 		Subjects: []rbacv1.Subject{
 			{
@@ -123,14 +122,14 @@ func (c Client) CreateClusterRoleBinding(name string, sa *v1.ServiceAccount, cr
 			Name: cr.Name,
 			Kind: "ClusterRole",
 		},
-	})
+	}, metav1.CreateOptions{})
 }
 
 // PodsListByLabels list pods filtered by labels.
 func (c Client) PodsListByLabels(namespace string, labels []string) (*v1.PodList, error) {
 	labelStr := strings.Join(labels, ",")
 
-	pods, err := c.Clientset.CoreV1().Pods(namespace).List(metav1.ListOptions{
+	pods, err := c.Clientset.CoreV1().Pods(namespace).List(context.TODO(), metav1.ListOptions{
 		LabelSelector: labelStr,
 	})
 	if err != nil {

e2e/scenario/scenario.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/newrelic/nri-kubernetes/e2e/jsonschema"
 	"k8s.io/apimachinery/pkg/version"
+
+	"github.com/newrelic/nri-kubernetes/v2/e2e/jsonschema"
 )
 
 // Scenario defines the environment that will be used for testing

go.mod

@@ -1,41 +1,26 @@
-module github.com/newrelic/nri-kubernetes
+module github.com/newrelic/nri-kubernetes/v2
 
 go 1.14
 
 require (
-	cloud.google.com/go v0.24.1-0.20180622202109-d84cd321885b // indirect
-	github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29 // indirect
-	github.com/elazarl/goproxy v0.0.0-20180530192236-91d82cc1070b // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/gogo/protobuf v0.0.0-20171213104750-35b81a066e52 // indirect
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
-	github.com/golang/protobuf v1.2.0
-	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
-	github.com/googleapis/gnostic v0.1.1-0.20171211024024-933c109c13ce // indirect
-	github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c // indirect
-	github.com/imdario/mergo v0.3.5-0.20180523075049-7045960c0518 // indirect
-	github.com/json-iterator/go v0.0.0-20171223025217-96fcb84835b0 // indirect
+	github.com/golang/protobuf v1.5.2
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/json-iterator/go v1.1.11 // indirect
 	github.com/newrelic/infra-integrations-sdk v2.0.1-0.20180410150501-14a5386f9150+incompatible
-	github.com/pkg/errors v0.8.0
-	github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910
-	github.com/prometheus/prom2json v1.1.1-0.20190107153843-47e3ee600b5a
+	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_model v0.2.0
+	github.com/prometheus/prom2json v1.3.0
 	github.com/segmentio/go-camelcase v0.0.0-20160726192923-7085f1e3c734
-	github.com/sirupsen/logrus v1.2.0
-	github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95 // indirect
-	github.com/stretchr/testify v1.2.2
-	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
-	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	github.com/xeipuuv/gojsonschema v0.0.0-20180525140004-9ff6d6c47f3f
-	golang.org/x/net v0.0.0-20180621144259-afe8f62b1d6b
-	golang.org/x/oauth2 v0.0.0-20180620175406-ef147856a6dd
-	golang.org/x/text v0.3.1-0.20180511172408-5c1cf69b5978 // indirect
-	golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
-	google.golang.org/appengine v1.1.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405 // indirect
-	gopkg.in/inf.v0 v0.9.0 // indirect
-	gopkg.in/yaml.v2 v2.0.0-20171116090243-287cf08546ab // indirect
-	k8s.io/api v0.0.0-20180521142803-feb48db456a5
-	k8s.io/apimachinery v0.0.0-20180515182440-31dade610c05
-	k8s.io/client-go v7.0.0+incompatible
-	k8s.io/kubernetes v1.9.3
+	github.com/sirupsen/logrus v1.8.1
+	github.com/stretchr/testify v1.7.0
+	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
+	github.com/xeipuuv/gojsonschema v1.2.0
+	golang.org/x/net v0.0.0-20210525063256-abc453219eb5
+	golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
+	k8s.io/api v0.21.1
+	k8s.io/apimachinery v0.21.1
+	k8s.io/client-go v0.21.1
+	k8s.io/kubelet v0.21.1
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.1 // indirect
 )