Merge pull request #74 from ankitathomas/bump-apiserver

Bug 1957127: pin apiserver for DelegatingAuthenticationOptions TokenReview request timeout

Author: openshift-merge-robot

go.mod

@@ -23,7 +23,7 @@ require (
 	google.golang.org/grpc v1.34.0
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.0.1
 	google.golang.org/protobuf v1.25.0
-	gopkg.in/yaml.v2 v2.3.0
+	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.1.0-rc.1.0.20201215141456-e71d38b414eb
 	k8s.io/api v0.20.6
 	k8s.io/apiextensions-apiserver v0.20.6
@@ -65,6 +65,12 @@ replace (
 	google.golang.org/grpc => google.golang.org/grpc v1.27.0
 	google.golang.org/grpc/examples => google.golang.org/grpc/examples v0.0.0-20200709232328-d8193ee9cc3e
 
+	// pinned for delegated authentication watch request bug fix.
+	k8s.io/apimachinery => k8s.io/apimachinery v0.21.0-beta.1.0.20210308143346-a13af1068ef1
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210409112051-49d90ce0ad13
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20210105235135-9c158118ed58
+
 	// pinned because no tag supports 1.18 yet
 	sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
+
 )

go.sum

@@ -10,8 +10,8 @@ require (
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-bindata/go-bindata/v3 v3.1.3
-	github.com/go-logr/logr v0.3.0
-	github.com/go-openapi/spec v0.19.4
+	github.com/go-logr/logr v0.4.0
+	github.com/go-openapi/spec v0.19.5
 	github.com/golang/mock v1.4.1
 	github.com/google/go-cmp v0.5.2
 	github.com/googleapis/gnostic v0.5.1
@@ -21,9 +21,8 @@ require (
 	github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
 	github.com/mitchellh/hashstructure v1.0.0
 	github.com/mitchellh/mapstructure v1.1.2
-	github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
-	github.com/onsi/ginkgo v1.14.1
-	github.com/onsi/gomega v1.10.2
+	github.com/onsi/ginkgo v1.14.2
+	github.com/onsi/gomega v1.10.3
 	github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
 	github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
 	github.com/operator-framework/api v0.0.0-00010101000000-000000000000
@@ -37,9 +36,9 @@ require (
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.6.1
-	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
+	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	google.golang.org/grpc v1.30.0
-	gopkg.in/yaml.v2 v2.3.0
+	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.1.0-rc.1.0.20201215141456-e71d38b414eb
 	// can't update to 0.21 until https://github.com/kubernetes/apiserver/issues/65 is resolved
 	k8s.io/api v0.20.6
@@ -71,6 +70,11 @@ replace (
 	google.golang.org/grpc => google.golang.org/grpc v1.27.0
 	google.golang.org/grpc/examples => google.golang.org/grpc/examples v0.0.0-20200709232328-d8193ee9cc3e
 
+	// pinned for delegated authentication watch request bug fix.
+	k8s.io/apimachinery => k8s.io/apimachinery v0.21.0-beta.1.0.20210308143346-a13af1068ef1
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210409112051-49d90ce0ad13
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20210105235135-9c158118ed58
+
 	// pinned because no tag supports 1.18 yet
 	sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
 )