Merge pull request #86 from varshavaradarajan/update-to-1.18

Update k8s dependencies to 0.18.3

.circleci/config.yml

@@ -2,21 +2,21 @@ version: 2
 jobs:
   license:
     docker:
-      - image: golang:1.12.6
+      - image: golang:1.13.12
     steps:
       - checkout
       - run: ./script/check-licenses.sh
   vet:
     environment:
       GOFLAGS: "-mod=vendor"
     docker:
-      - image: golang:1.12.6
+      - image: golang:1.13.12
     steps:
       - checkout
       - run: go vet ./...
   lint:
     docker:
-      - image: golang:1.12.6
+      - image: golang:1.13.12
     steps:
       - checkout
       - run: go get golang.org/x/lint/golint
@@ -25,7 +25,7 @@ jobs:
     environment:
       GOFLAGS: "-mod=vendor"
     docker:
-      - image: golang:1.12.6
+      - image: golang:1.13.12
     steps:
       - checkout
       - run: go test -race -cover ./...

checks/run_checks_test.go

@@ -36,11 +36,11 @@ func TestRun(t *testing.T) {
 	client := &kube.Client{
 		KubeClient: fake.NewSimpleClientset(),
 	}
-	client.KubeClient.CoreV1().Namespaces().Create(&corev1.Namespace{
+	client.KubeClient.CoreV1().Namespaces().Create(context.Background(), &corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "kube-system",
 		},
-	})
+	}, metav1.CreateOptions{})
 
 	alwaysFailCheck, err := Get("always-fail")
 	assert.NoError(t, err)

go.mod

@@ -4,13 +4,14 @@ go 1.12
 
 require (
 	github.com/docker/distribution v2.7.1+incompatible
-	github.com/fatih/color v1.7.0
-	github.com/mattn/go-colorable v0.1.2 // indirect
+	github.com/fatih/color v1.9.0
+	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
 	github.com/stretchr/testify v1.4.0
 	github.com/urfave/cli v1.19.1
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	k8s.io/api v0.17.3
-	k8s.io/apimachinery v0.17.3
-	k8s.io/client-go v0.17.3
+	golang.org/x/sys v0.0.0-20200610111108-226ff32320da // indirect
+	k8s.io/api v0.18.3
+	k8s.io/apimachinery v0.18.3
+	k8s.io/client-go v0.18.3
 )

kube/objects.go

@@ -70,70 +70,69 @@ func (c *Client) FetchObjects(ctx context.Context, filter ObjectFilter) (*Object
 	opts := metav1.ListOptions{}
 	objects := &Objects{}
 
-	var g errgroup.Group
-
+	g, gCtx := errgroup.WithContext(ctx)
 	g.Go(func() (err error) {
-		objects.Nodes, err = client.Nodes().List(opts)
+		objects.Nodes, err = client.Nodes().List(gCtx, opts)
 		return
 	})
 	g.Go(func() (err error) {
-		objects.PersistentVolumes, err = client.PersistentVolumes().List(opts)
+		objects.PersistentVolumes, err = client.PersistentVolumes().List(gCtx, opts)
 		return
 	})
 	g.Go(func() (err error) {
-		objects.ComponentStatuses, err = client.ComponentStatuses().List(opts)
+		objects.ComponentStatuses, err = client.ComponentStatuses().List(gCtx, opts)
 		return
 	})
 	g.Go(func() (err error) {
-		objects.Pods, err = client.Pods(corev1.NamespaceAll).List(filter.NamespaceOptions(opts))
+		objects.Pods, err = client.Pods(corev1.NamespaceAll).List(gCtx, filter.NamespaceOptions(opts))
 		return
 	})
 	g.Go(func() (err error) {
-		objects.PodTemplates, err = client.PodTemplates(corev1.NamespaceAll).List(filter.NamespaceOptions(opts))
+		objects.PodTemplates, err = client.PodTemplates(corev1.NamespaceAll).List(gCtx, filter.NamespaceOptions(opts))
 		return
 	})
 	g.Go(func() (err error) {
-		objects.PersistentVolumeClaims, err = client.PersistentVolumeClaims(corev1.NamespaceAll).List(filter.NamespaceOptions(opts))
+		objects.PersistentVolumeClaims, err = client.PersistentVolumeClaims(corev1.NamespaceAll).List(gCtx, filter.NamespaceOptions(opts))
 		return
 	})
 	g.Go(func() (err error) {
-		objects.ConfigMaps, err = client.ConfigMaps(corev1.NamespaceAll).List(filter.NamespaceOptions(opts))
+		objects.ConfigMaps, err = client.ConfigMaps(corev1.NamespaceAll).List(gCtx, filter.NamespaceOptions(opts))
 		return
 	})
 	g.Go(func() (err error) {
-		objects.Secrets, err = client.Secrets(corev1.NamespaceAll).List(filter.NamespaceOptions(opts))
+		objects.Secrets, err = client.Secrets(corev1.NamespaceAll).List(gCtx, filter.NamespaceOptions(opts))
 		return
 	})
 	g.Go(func() (err error) {
-		objects.Services, err = client.Services(corev1.NamespaceAll).List(filter.NamespaceOptions(opts))
+		objects.Services, err = client.Services(corev1.NamespaceAll).List(gCtx, filter.NamespaceOptions(opts))
 		return
 	})
 	g.Go(func() (err error) {
-		objects.ServiceAccounts, err = client.ServiceAccounts(corev1.NamespaceAll).List(filter.NamespaceOptions(opts))
+		objects.ServiceAccounts, err = client.ServiceAccounts(corev1.NamespaceAll).List(gCtx, filter.NamespaceOptions(opts))
 		return
 	})
 	g.Go(func() (err error) {
-		objects.ResourceQuotas, err = client.ResourceQuotas(corev1.NamespaceAll).List(filter.NamespaceOptions(opts))
+		objects.ResourceQuotas, err = client.ResourceQuotas(corev1.NamespaceAll).List(gCtx, filter.NamespaceOptions(opts))
 		return
 	})
 	g.Go(func() (err error) {
-		objects.LimitRanges, err = client.LimitRanges(corev1.NamespaceAll).List(filter.NamespaceOptions(opts))
+		objects.LimitRanges, err = client.LimitRanges(corev1.NamespaceAll).List(gCtx, filter.NamespaceOptions(opts))
 		return
 	})
 	g.Go(func() (err error) {
-		objects.SystemNamespace, err = client.Namespaces().Get(metav1.NamespaceSystem, metav1.GetOptions{})
+		objects.SystemNamespace, err = client.Namespaces().Get(gCtx, metav1.NamespaceSystem, metav1.GetOptions{})
 		return
 	})
 	g.Go(func() (err error) {
-		objects.MutatingWebhookConfigurations, err = admissionControllerClient.MutatingWebhookConfigurations().List(opts)
+		objects.MutatingWebhookConfigurations, err = admissionControllerClient.MutatingWebhookConfigurations().List(gCtx, opts)
 		return
 	})
 	g.Go(func() (err error) {
-		objects.ValidatingWebhookConfigurations, err = admissionControllerClient.ValidatingWebhookConfigurations().List(opts)
+		objects.ValidatingWebhookConfigurations, err = admissionControllerClient.ValidatingWebhookConfigurations().List(gCtx, opts)
 		return
 	})
 	g.Go(func() (err error) {
-		objects.Namespaces, err = client.Namespaces().List(opts)
+		objects.Namespaces, err = client.Namespaces().List(gCtx, opts)
 		return
 	})
 

kube/objects_test.go

@@ -33,12 +33,12 @@ func TestFetchObjects(t *testing.T) {
 		KubeClient: fake.NewSimpleClientset(),
 	}
 
-	api.KubeClient.CoreV1().Namespaces().Create(&corev1.Namespace{
+	api.KubeClient.CoreV1().Namespaces().Create(context.Background(), &corev1.Namespace{
 		TypeMeta: metav1.TypeMeta{Kind: "Namespace", APIVersion: "v1"},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   "kube-system",
 			Labels: map[string]string{"doks_key": "bar"}},
-	})
+	}, metav1.CreateOptions{})
 
 	actual, err := api.FetchObjects(context.Background(), ObjectFilter{})
 	assert.NoError(t, err)
@@ -97,11 +97,11 @@ users:
 - name: admin
 `)))
 	assert.NoError(t, err)
-	_, err = client.KubeClient.CoreV1().Namespaces().Create(&corev1.Namespace{
+	_, err = client.KubeClient.CoreV1().Namespaces().Create(context.Background(), &corev1.Namespace{
 		TypeMeta: metav1.TypeMeta{Kind: "Namespace", APIVersion: "v1"},
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "kube-system",
 		},
-	})
+	}, metav1.CreateOptions{})
 	assert.Contains(t, err.Error(), "fail")
 }