Merge pull request #161 from p0lyn0mial/release-4.6-sar-tr-no-stack-o…

…n-panic Bug 1894916: Panic output due to timeouts in openshift-apiserver
openshift · Jan 28, 2021 · ee20d4a · ee20d4a
2 parents 9143a79 + 3c83f6c
commit ee20d4a
Show file tree

Hide file tree

Showing 9 changed files with 92 additions and 23 deletions.
diff --git a/go.mod b/go.mod
@@ -53,7 +53,7 @@ replace (
 	k8s.io/api => k8s.io/api v0.19.0
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0
 	k8s.io/apimachinery => k8s.io/apimachinery v0.19.0
-	k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20200907145057-b96d25345a7b
+	k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20201207110950-476028df0fd8
 	k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0
 	k8s.io/client-go => k8s.io/client-go v0.19.0
 	k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0

diff --git a/go.sum b/go.sum
@@ -532,8 +532,8 @@ github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5 h1:E6WhVL5p3rf
 github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5/go.mod h1:5rGmrkQ8DJEUXA+AR3rEjfH+HFyg4/apY9iCQFgvPfE=
 github.com/openshift/docker-distribution v0.0.0-20180925154709-d4c35485a70d h1:tupVADlF1SZrGy0Y0kg1FKUi2mVPzRwxVb+8LLMu8ws=
 github.com/openshift/docker-distribution v0.0.0-20180925154709-d4c35485a70d/go.mod h1:XmfFzbwryblvZ29NebonirM7RBuNEO7+yVCOapaouAk=
-github.com/openshift/kubernetes-apiserver v0.0.0-20200907145057-b96d25345a7b h1:d1IKJwwmx2vf9QJZZGFy+L4foM4qjz/sBmGavpd1saA=
-github.com/openshift/kubernetes-apiserver v0.0.0-20200907145057-b96d25345a7b/go.mod h1:XvzqavYj73931x7FLtyagh8WibHpePJ1QwWrSJs2CLk=
+github.com/openshift/kubernetes-apiserver v0.0.0-20201207110950-476028df0fd8 h1:DngALbqoJFcqMYEgkfcvAZU91GW1ZzYLA/3iNLYJyKc=
+github.com/openshift/kubernetes-apiserver v0.0.0-20201207110950-476028df0fd8/go.mod h1:XvzqavYj73931x7FLtyagh8WibHpePJ1QwWrSJs2CLk=
 github.com/openshift/library-go v0.0.0-20200831114015-2ab0c61c15de/go.mod h1:6vwp+YhYOIlj8MpkQKkebTTSn2TuYyvgiAFQ206jIEQ=
 github.com/openshift/library-go v0.0.0-20200907120738-ea57b121ba1a h1:etunyXI5tA6MhhWcCKwKlfqsPyxy+k3Yyzl1mwpqpJI=
 github.com/openshift/library-go v0.0.0-20200907120738-ea57b121ba1a/go.mod h1:6vwp+YhYOIlj8MpkQKkebTTSn2TuYyvgiAFQ206jIEQ=

diff --git a/vendor/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go b/vendor/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
diff --git a/vendor/k8s.io/apiserver/pkg/server/config.go b/vendor/k8s.io/apiserver/pkg/server/config.go
diff --git a/vendor/k8s.io/apiserver/pkg/server/filters/timeout.go b/vendor/k8s.io/apiserver/pkg/server/filters/timeout.go
diff --git a/vendor/k8s.io/apiserver/pkg/server/filters/wrap.go b/vendor/k8s.io/apiserver/pkg/server/filters/wrap.go
diff --git a/vendor/k8s.io/apiserver/pkg/server/options/authentication.go b/vendor/k8s.io/apiserver/pkg/server/options/authentication.go
diff --git a/vendor/k8s.io/apiserver/pkg/server/options/authorization.go b/vendor/k8s.io/apiserver/pkg/server/options/authorization.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -900,7 +900,7 @@ k8s.io/apimachinery/pkg/watch
 k8s.io/apimachinery/third_party/forked/golang/json
 k8s.io/apimachinery/third_party/forked/golang/netutil
 k8s.io/apimachinery/third_party/forked/golang/reflect
-# k8s.io/apiserver v0.19.0 => github.com/openshift/kubernetes-apiserver v0.0.0-20200907145057-b96d25345a7b
+# k8s.io/apiserver v0.19.0 => github.com/openshift/kubernetes-apiserver v0.0.0-20201207110950-476028df0fd8
 k8s.io/apiserver/pkg/admission
 k8s.io/apiserver/pkg/admission/configuration
 k8s.io/apiserver/pkg/admission/initializer