Merge pull request #177 from skisel/bumpk8s

Bump k8s library
txn2 · Mar 15, 2021 · f5db6f4 · f5db6f4
2 parents ef08034 + 7ef02d9
commit f5db6f4
Show file tree

Hide file tree

Showing 5 changed files with 621 additions and 16 deletions.
diff --git a/cmd/kubefwd/services/services.go b/cmd/kubefwd/services/services.go
@@ -23,6 +23,7 @@ import (
 	"sync"
 	"syscall"
 	"time"
+	"context"
 
 	"github.com/bep/debounce"
 	"github.com/txn2/kubefwd/pkg/fwdcfg"
@@ -110,7 +111,7 @@ func checkConnection(clientSet *kubernetes.Clientset, namespaces []string) error
 					ResourceAttributes: &perm,
 				},
 			}
-			accessReview, err = clientSet.AuthorizationV1().SelfSubjectAccessReviews().Create(accessReview)
+			accessReview, err = clientSet.AuthorizationV1().SelfSubjectAccessReviews().Create(context.TODO(), accessReview, metav1.CreateOptions{})
 			if err != nil {
 				return err
 			}
@@ -362,12 +363,12 @@ func (opts *NamespaceOpts) watchServiceEvents(stopListenCh <-chan struct{}) {
 		&cache.ListWatch{
 			ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
 				optionsModifier(&options)
-				return opts.ClientSet.CoreV1().Services(opts.Namespace).List(options)
+				return opts.ClientSet.CoreV1().Services(opts.Namespace).List(context.TODO(), options)
 			},
 			WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
 				options.Watch = true
 				optionsModifier(&options)
-				return opts.ClientSet.CoreV1().Services(opts.Namespace).Watch(options)
+				return opts.ClientSet.CoreV1().Services(opts.Namespace).Watch(context.TODO(), options)
 			},
 		},
 		&v1.Service{},

diff --git a/go.mod b/go.mod
@@ -4,16 +4,23 @@ go 1.13
 
 require (
 	github.com/bep/debounce v1.2.0
+	github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0 // indirect
 	github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect
-	github.com/pkg/errors v0.8.1
+	github.com/gophercloud/gophercloud v0.1.0 // indirect
+	github.com/pkg/errors v0.9.1
 	github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989 // indirect
-	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/cobra v0.0.5
+	github.com/sirupsen/logrus v1.6.0
+	github.com/spf13/cobra v1.1.1
 	github.com/txn2/txeh v1.2.1
-	golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e
-	k8s.io/api v0.0.0-20191108065827-59e77acf588f
-	k8s.io/apimachinery v0.0.0-20191108065633-c18f71bf2947
-	k8s.io/cli-runtime v0.0.0-20191108072024-9fe36560f3af
-	k8s.io/client-go v0.0.0-20191108070106-f8f007fd456c
-	k8s.io/kubectl v0.0.0-20191108073526-feacf2b3d48e
+	github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
+	golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
+	gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // indirect
+	k8s.io/api v0.20.4
+	k8s.io/apimachinery v0.20.4
+	k8s.io/cli-runtime v0.20.4
+	k8s.io/client-go v0.20.4
+	k8s.io/klog v1.0.0 // indirect
+	k8s.io/kubectl v0.20.4
+	sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e // indirect
+	vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc // indirect
 )