kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle errors 

Kubernetes-commit: 5cab7f9a57dbbd6e2a181018aae523235843f77d
This commit is contained in:
Mikhail Mazurskiy 2018-07-17 20:29:55 +10:00 committed by Kubernetes Publisher
parent 361587e353
commit 0ba502e8f9
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/server/resourceconfig/helpers_test.go
View File

@ -170,8 +170,8 @@ func newFakeScheme(t *testing.T) *runtime.Scheme {
require.NoError(t, apiv1.AddToScheme(ret)) require.NoError(t, apiv1.AddToScheme(ret))
require.NoError(t, extensionsapiv1beta1.AddToScheme(ret)) require.NoError(t, extensionsapiv1beta1.AddToScheme(ret))
ret.SetVersionPriority(apiv1.SchemeGroupVersion) require.NoError(t, ret.SetVersionPriority(apiv1.SchemeGroupVersion))
ret.SetVersionPriority(extensionsapiv1beta1.SchemeGroupVersion) require.NoError(t, ret.SetVersionPriority(extensionsapiv1beta1.SchemeGroupVersion))
return ret return ret
} }

9
plugin/pkg/authenticator/token/webhook/webhook.go
View File

@ -26,7 +26,6 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/cache" "k8s.io/apimachinery/pkg/util/cache"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/util/webhook" "k8s.io/apiserver/pkg/util/webhook"
@ -118,8 +117,12 @@ func (w *WebhookTokenAuthenticator) AuthenticateToken(token string) (user.Info,
// requests to the exact path specified in the kubeconfig file, so arbitrary non-API servers can be targeted. // requests to the exact path specified in the kubeconfig file, so arbitrary non-API servers can be targeted.
func tokenReviewInterfaceFromKubeconfig(kubeConfigFile string) (authenticationclient.TokenReviewInterface, error) { func tokenReviewInterfaceFromKubeconfig(kubeConfigFile string) (authenticationclient.TokenReviewInterface, error) {
localScheme := runtime.NewScheme() localScheme := runtime.NewScheme()
scheme.AddToScheme(localScheme) if err := scheme.AddToScheme(localScheme); err != nil {
utilruntime.Must(localScheme.SetVersionPriority(groupVersions...)) return nil, err
}
if err := localScheme.SetVersionPriority(groupVersions...); err != nil {
return nil, err
}
gw, err := webhook.NewGenericWebhook(localScheme, scheme.Codecs, kubeConfigFile, groupVersions, 0) gw, err := webhook.NewGenericWebhook(localScheme, scheme.Codecs, kubeConfigFile, groupVersions, 0)
if err != nil { if err != nil {

8
plugin/pkg/authorizer/webhook/webhook.go
View File

@ -239,8 +239,12 @@ func convertToSARExtra(extra map[string][]string) map[string]authorization.Extra
// requests to the exact path specified in the kubeconfig file, so arbitrary non-API servers can be targeted. // requests to the exact path specified in the kubeconfig file, so arbitrary non-API servers can be targeted.
func subjectAccessReviewInterfaceFromKubeconfig(kubeConfigFile string) (authorizationclient.SubjectAccessReviewInterface, error) { func subjectAccessReviewInterfaceFromKubeconfig(kubeConfigFile string) (authorizationclient.SubjectAccessReviewInterface, error) {
localScheme := runtime.NewScheme() localScheme := runtime.NewScheme()
scheme.AddToScheme(localScheme) if err := scheme.AddToScheme(localScheme); err != nil {
localScheme.SetVersionPriority(groupVersions...) return nil, err
}
if err := localScheme.SetVersionPriority(groupVersions...); err != nil {
return nil, err
}
gw, err := webhook.NewGenericWebhook(localScheme, scheme.Codecs, kubeConfigFile, groupVersions, 0) gw, err := webhook.NewGenericWebhook(localScheme, scheme.Codecs, kubeConfigFile, groupVersions, 0)
if err != nil { if err != nil {