Merge pull request #70060 from pbarker/audit-webhook

updates shared apiserver webhook client
kubernetes · Oct 23, 2018 · 9fb4a2a · 9fb4a2a
2 parents 1af393d + 5874a1f
commit 9fb4a2a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/staging/src/k8s.io/apiserver/pkg/util/webhook/client.go b/staging/src/k8s.io/apiserver/pkg/util/webhook/client.go
@@ -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
 }

diff --git a/staging/src/k8s.io/apiserver/pkg/util/webhook/error.go b/staging/src/k8s.io/apiserver/pkg/util/webhook/error.go
@@ -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)
 }
diff --git a/staging/src/k8s.io/apiserver/pkg/util/webhook/webhook.go b/staging/src/k8s.io/apiserver/pkg/util/webhook/webhook.go
@@ -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()
 	})