diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 8fa850681..a7e06282c 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -784,351 +784,351 @@ }, { "ImportPath": "k8s.io/apiserver/pkg/admission", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/configuration", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/initializer", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/metrics", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/initialization", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/config", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/errors", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/namespace", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/request", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/rules", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/validating", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/versioned", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/apis/apiserver", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/apis/apiserver/install", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/apis/apiserver/v1alpha1", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/apis/audit", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/apis/audit/install", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/apis/audit/v1alpha1", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/apis/audit/v1beta1", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/apis/audit/validation", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/audit", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/audit/policy", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authentication/authenticator", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authentication/authenticatorfactory", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authentication/group", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authentication/request/anonymous", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authentication/request/bearertoken", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authentication/request/headerrequest", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authentication/request/union", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authentication/request/websocket", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authentication/request/x509", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authentication/serviceaccount", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authentication/token/tokenfile", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authentication/user", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authorization/authorizer", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authorization/authorizerfactory", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/authorization/union", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/endpoints", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/endpoints/discovery", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/endpoints/filters", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/endpoints/handlers", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/endpoints/handlers/negotiation", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/endpoints/metrics", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/endpoints/openapi", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/endpoints/request", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/features", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/registry/generic", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/registry/generic/registry", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/registry/rest", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/server", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/server/filters", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/server/healthz", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/server/httplog", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/server/mux", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/server/options", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/server/resourceconfig", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/server/routes", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/server/routes/data/swagger", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/server/storage", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/storage", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/storage/errors", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/storage/etcd", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/storage/etcd/metrics", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/storage/etcd/util", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/storage/etcd3", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/storage/etcd3/preflight", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/storage/names", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/storage/storagebackend", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/storage/storagebackend/factory", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/storage/value", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/util/feature", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/util/flag", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/util/flushwriter", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/util/logs", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/util/trace", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/util/webhook", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/pkg/util/wsstream", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/plugin/pkg/audit/buffered", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/plugin/pkg/audit/log", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/plugin/pkg/audit/webhook", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/plugin/pkg/authenticator/token/webhook", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/apiserver/plugin/pkg/authorizer/webhook", - "Rev": "cedc05c7d2d1f70cf28ee28d03edc22e87b90d1d" + "Rev": "766e8cc42fa1a39a055b62d9d80007842d35eeb7" }, { "ImportPath": "k8s.io/client-go/discovery", diff --git a/artifacts/example/rc.yaml b/artifacts/example/rc.yaml index 660e780a5..53be32346 100644 --- a/artifacts/example/rc.yaml +++ b/artifacts/example/rc.yaml @@ -21,4 +21,4 @@ spec: imagePullPolicy: Never command: [ "/kube-sample-apiserver", "--etcd-servers=http://localhost:2379" ] - name: etcd - image: quay.io/coreos/etcd:v3.1.11 + image: quay.io/coreos/etcd:v3.1.12 diff --git a/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/config/client.go b/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/config/client.go index 808ef944f..bfc9bbd7f 100644 --- a/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/config/client.go +++ b/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/config/client.go @@ -24,8 +24,10 @@ import ( "net/url" lru "github.com/hashicorp/golang-lru" + admissionv1beta1 "k8s.io/api/admission/v1beta1" "k8s.io/api/admissionregistration/v1beta1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/serializer" utilerrors "k8s.io/apimachinery/pkg/util/errors" webhookerrors "k8s.io/apiserver/pkg/admission/plugin/webhook/errors" "k8s.io/client-go/rest" @@ -54,8 +56,13 @@ func NewClientManager() (ClientManager, error) { if err != nil { return ClientManager{}, err } + admissionScheme := runtime.NewScheme() + admissionv1beta1.AddToScheme(admissionScheme) return ClientManager{ cache: cache, + negotiatedSerializer: serializer.NegotiatedSerializerWrapper(runtime.SerializerInfo{ + Serializer: serializer.NewCodecFactory(admissionScheme).LegacyCodec(admissionv1beta1.SchemeGroupVersion), + }), }, nil } @@ -79,11 +86,6 @@ func (cm *ClientManager) SetServiceResolver(sr ServiceResolver) { } } -// SetNegotiatedSerializer sets the NegotiatedSerializer. -func (cm *ClientManager) SetNegotiatedSerializer(n runtime.NegotiatedSerializer) { - cm.negotiatedSerializer = n -} - // Validate checks if ClientManager is properly set up. func (cm *ClientManager) Validate() error { var errs []error @@ -168,7 +170,7 @@ func (cm *ClientManager) HookClient(h *v1beta1.Webhook) (*rest.RESTClient, error } cfg := rest.CopyConfig(restConfig) - cfg.Host = u.Host + cfg.Host = u.Scheme + "://" + u.Host cfg.APIPath = u.Path return complete(cfg) diff --git a/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/admission.go b/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/admission.go index 9982c82a3..57f82d4d5 100644 --- a/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/admission.go +++ b/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/admission.go @@ -31,7 +31,6 @@ import ( "k8s.io/api/admissionregistration/v1beta1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer/json" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/admission" @@ -131,9 +130,6 @@ func (a *MutatingWebhook) SetServiceResolver(sr config.ServiceResolver) { // SetScheme sets a serializer(NegotiatedSerializer) which is derived from the scheme func (a *MutatingWebhook) SetScheme(scheme *runtime.Scheme) { if scheme != nil { - a.clientManager.SetNegotiatedSerializer(serializer.NegotiatedSerializerWrapper(runtime.SerializerInfo{ - Serializer: serializer.NewCodecFactory(scheme).LegacyCodec(admissionv1beta1.SchemeGroupVersion), - })) a.convertor.Scheme = scheme a.defaulter = scheme a.jsonSerializer = json.NewSerializer(json.DefaultMetaFactory, scheme, scheme, false) diff --git a/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/admission.go b/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/admission.go index fc77e5b95..d3bcb3389 100644 --- a/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/admission.go +++ b/vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/admission.go @@ -31,7 +31,6 @@ import ( "k8s.io/api/admissionregistration/v1beta1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission/configuration" @@ -128,9 +127,6 @@ func (a *ValidatingAdmissionWebhook) SetServiceResolver(sr config.ServiceResolve // SetScheme sets a serializer(NegotiatedSerializer) which is derived from the scheme func (a *ValidatingAdmissionWebhook) SetScheme(scheme *runtime.Scheme) { if scheme != nil { - a.clientManager.SetNegotiatedSerializer(serializer.NegotiatedSerializerWrapper(runtime.SerializerInfo{ - Serializer: serializer.NewCodecFactory(scheme).LegacyCodec(admissionv1beta1.SchemeGroupVersion), - })) a.convertor.Scheme = scheme } } diff --git a/vendor/k8s.io/apiserver/pkg/server/options/audit.go b/vendor/k8s.io/apiserver/pkg/server/options/audit.go index 4e2fa0acd..f23232a0b 100644 --- a/vendor/k8s.io/apiserver/pkg/server/options/audit.go +++ b/vendor/k8s.io/apiserver/pkg/server/options/audit.go @@ -364,7 +364,7 @@ func (o *AuditWebhookOptions) applyTo(c *server.Config) error { return nil } - webhook, err := pluginwebhook.NewBackend(o.ConfigFile, auditv1beta1.SchemeGroupVersion) + webhook, err := pluginwebhook.NewBackend(o.ConfigFile, auditv1beta1.SchemeGroupVersion, o.InitialBackoff) if err != nil { return fmt.Errorf("initializing audit webhook: %v", err) } diff --git a/vendor/k8s.io/apiserver/plugin/pkg/audit/webhook/webhook.go b/vendor/k8s.io/apiserver/plugin/pkg/audit/webhook/webhook.go index a5ce7285c..2b25be3ff 100644 --- a/vendor/k8s.io/apiserver/plugin/pkg/audit/webhook/webhook.go +++ b/vendor/k8s.io/apiserver/plugin/pkg/audit/webhook/webhook.go @@ -70,8 +70,8 @@ type backend struct { } // NewBackend returns an audit backend that sends events over HTTP to an external service. -func NewBackend(kubeConfigFile string, groupVersion schema.GroupVersion) (audit.Backend, error) { - w, err := loadWebhook(kubeConfigFile, groupVersion, DefaultInitialBackoff) +func NewBackend(kubeConfigFile string, groupVersion schema.GroupVersion, initialBackoff time.Duration) (audit.Backend, error) { + w, err := loadWebhook(kubeConfigFile, groupVersion, initialBackoff) if err != nil { return nil, err }