github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70060 from pbarker/audit-webhook 

updates shared apiserver webhook client
pull/58/head
k8s-ci-robot 2018-10-22 17:07:46 -07:00 committed by GitHub
parent 1af393d58e 5874a1f8fa
commit 9fb4a2aa9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/util/webhook/client.go
View File

@ -66,14 +66,14 @@ func NewClientManager(gv schema.GroupVersion, addToSchemaFunc func(s *runtime.Sc
if err != nil {
return ClientManager{}, err
}
admissionScheme := runtime.NewScheme()
if err := addToSchemaFunc(admissionScheme); err != nil {
hookScheme := runtime.NewScheme()
if err := addToSchemaFunc(hookScheme); err != nil {
return ClientManager{}, err
}
return ClientManager{
cache: cache,
negotiatedSerializer: serializer.NegotiatedSerializerWrapper(runtime.SerializerInfo{
Serializer: serializer.NewCodecFactory(admissionScheme).LegacyCodec(gv),
Serializer: serializer.NewCodecFactory(hookScheme).LegacyCodec(gv),
}),
}, nil
}

4
staging/src/k8s.io/apiserver/pkg/util/webhook/error.go
View File

@ -28,7 +28,7 @@ type ErrCallingWebhook struct {
func (e *ErrCallingWebhook) Error() string {
if e.Reason != nil {
return fmt.Sprintf("failed calling admission webhook %q: %v", e.WebhookName, e.Reason)
return fmt.Sprintf("failed calling webhook %q: %v", e.WebhookName, e.Reason)
}
return fmt.Sprintf("failed calling admission webhook %q; no further details available", e.WebhookName)
return fmt.Sprintf("failed calling webhook %q; no further details available", e.WebhookName)
}

4
staging/src/k8s.io/apiserver/pkg/util/webhook/webhook.go
View File

@ -37,7 +37,7 @@ const defaultRequestTimeout = 30 * time.Second
type GenericWebhook struct {
RestClient *rest.RESTClient
initialBackoff time.Duration
InitialBackoff time.Duration
}
// NewGenericWebhook creates a new GenericWebhook from the provided kubeconfig file.
@ -83,7 +83,7 @@ func newGenericWebhook(scheme *runtime.Scheme, codecFactory serializer.CodecFact
// it returns an error for which apierrors.SuggestsClientDelay() or apierrors.IsInternalError() returns true.
func (g *GenericWebhook) WithExponentialBackoff(webhookFn func() rest.Result) rest.Result {
var result rest.Result
WithExponentialBackoff(g.initialBackoff, func() error {
WithExponentialBackoff(g.InitialBackoff, func() error {
result = webhookFn()
return result.Error()
})