Bump go-discover to fix broken dep tree (#10898)

hashicorp · Sep 16, 2021 · 2dc62aa · 2dc62aa
1 parent 42b7fd3
commit 2dc62aa
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 64 deletions.
diff --git a/agent/consul/authmethod/kubeauth/k8s.go b/agent/consul/authmethod/kubeauth/k8s.go
@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/consul/agent/consul/authmethod"
-	"github.com/hashicorp/consul/agent/structs"
 	cleanhttp "github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/go-hclog"
 	"gopkg.in/square/go-jose.v2/jwt"
@@ -18,6 +16,9 @@ import (
 	client_corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	client_rest "k8s.io/client-go/rest"
 	cert "k8s.io/client-go/util/cert"
+
+	"github.com/hashicorp/consul/agent/consul/authmethod"
+	"github.com/hashicorp/consul/agent/structs"
 )
 
 func init() {
@@ -132,11 +133,11 @@ func (v *Validator) ValidateLogin(ctx context.Context, loginToken string) (*auth
 	}
 
 	// Check TokenReview for the bulk of the work.
-	trResp, err := v.trGetter.TokenReviews().Create(&authv1.TokenReview{
+	trResp, err := v.trGetter.TokenReviews().Create(ctx, &authv1.TokenReview{
 		Spec: authv1.TokenReviewSpec{
 			Token: loginToken,
 		},
-	})
+	}, client_metav1.CreateOptions{})
 
 	if err != nil {
 		return nil, err
@@ -166,7 +167,7 @@ func (v *Validator) ValidateLogin(ctx context.Context, loginToken string) (*auth
 	)
 
 	// Check to see  if there is an override name on the ServiceAccount object.
-	sa, err := v.saGetter.ServiceAccounts(saNamespace).Get(saName, client_metav1.GetOptions{})
+	sa, err := v.saGetter.ServiceAccounts(saNamespace).Get(ctx, saName, client_metav1.GetOptions{})
 	if err != nil {
 		return nil, fmt.Errorf("annotation lookup failed: %v", err)
 	}

diff --git a/go.mod b/go.mod
@@ -35,7 +35,7 @@ require (
 	github.com/hashicorp/go-checkpoint v0.5.0
 	github.com/hashicorp/go-cleanhttp v0.5.1
 	github.com/hashicorp/go-connlimit v0.3.0
-	github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088
+	github.com/hashicorp/go-discover v0.0.0-20210818145131-c573d69da192
 	github.com/hashicorp/go-hclog v0.14.1
 	github.com/hashicorp/go-memdb v1.3.1
 	github.com/hashicorp/go-msgpack v0.5.5
@@ -93,9 +93,9 @@ require (
 	google.golang.org/grpc v1.25.1
 	gopkg.in/square/go-jose.v2 v2.5.1
 	gotest.tools/v3 v3.0.3
-	k8s.io/api v0.16.9
-	k8s.io/apimachinery v0.16.9
-	k8s.io/client-go v0.16.9
+	k8s.io/api v0.18.2
+	k8s.io/apimachinery v0.18.2
+	k8s.io/client-go v0.18.2
 )
 
 replace istio.io/gogo-genproto v0.0.0-20190124151557-6d926a6e6feb => github.com/istio/gogo-genproto v0.0.0-20190124151557-6d926a6e6feb