Merge pull request #75 from p0lyn0mial/pick-100959

Bug 1948311: DelegatingAuthenticationOptions TokenReview request timeout

go.mod

@@ -1,37 +1,36 @@
 module github.com/openshift/oauth-server
 
-go 1.15
+go 1.16
 
 require (
 	github.com/RangelReale/osin v0.0.0
 	github.com/RangelReale/osincli v0.0.0
 	github.com/davecgh/go-spew v1.1.1
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/gophercloud/gophercloud v0.1.0
 	github.com/gorilla/context v0.0.0-20190627024605-8559d4a6b87e // indirect
 	github.com/gorilla/securecookie v0.0.0-20190707033817-86450627d8e6 // indirect
 	github.com/gorilla/sessions v0.0.0-20171008214740-a3acf13e802c
-	github.com/gorilla/websocket v1.4.1 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.10.0 // indirect
-	github.com/openshift/api v0.0.0-20201019163320-c6a5ec25f267
-	github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab
-	github.com/openshift/client-go v0.0.0-20201020074620-f8fd44879f7c
-	github.com/openshift/library-go v0.0.0-20201104144938-58b60c8e9aca
-	github.com/spf13/cobra v1.0.0
+	github.com/openshift/api v0.0.0-20210331193751-3acddb19d360
+	github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359
+	github.com/openshift/client-go v0.0.0-20210331195552-cf6c2669e01f
+	github.com/openshift/library-go v0.0.0-20210414082648-6e767630a0dc
+	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
+	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	gopkg.in/ldap.v2 v2.5.1
-	k8s.io/api v0.19.2
-	k8s.io/apimachinery v0.19.2
-	k8s.io/apiserver v0.19.2
-	k8s.io/client-go v0.19.2
-	k8s.io/component-base v0.19.2
-	k8s.io/klog/v2 v2.3.0
+	k8s.io/api v0.21.0
+	k8s.io/apimachinery v0.21.0
+	k8s.io/apiserver v0.21.0
+	k8s.io/client-go v0.21.0
+	k8s.io/component-base v0.21.0
+	k8s.io/klog/v2 v2.8.0
 )
 
 replace (
 	github.com/RangelReale/osin => github.com/openshift/osin v1.0.1-0.20180202150137-2dc1b4316769
 	github.com/RangelReale/osincli => github.com/openshift/osincli v0.0.0-20160924135400-fababb0555f2
-	k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20201110074854-ee87de0d9d20 // points to openshift-apiserver-4.7-kubernetes-1.19.2
-	k8s.io/client-go => github.com/openshift/kubernetes-client-go v0.0.0-20201104094117-806c7d66cfea
+	k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20210416115049-61c04108f2c7 // points to openshift-apiserver-4.8-kubernetes-1.21.0
 )