Merge pull request #21 from munnerz/k8s-113

Update dependencies for Kubernetes 1.13.2

glide.yaml

@@ -1,19 +1,19 @@
 package: github.com/openshift/generic-admission-server
 import:
 - package: k8s.io/code-generator
-  version: kubernetes-1.11.0
+  version: kubernetes-1.13.2
 - package: k8s.io/client-go
-  version: kubernetes-1.11.0
+  version: kubernetes-1.13.2
 - package: k8s.io/apimachinery
-  version: kubernetes-1.11.0
+  version: kubernetes-1.13.2
 - package: k8s.io/apiserver
-  version: kubernetes-1.11.0
+  version: kubernetes-1.13.2
 - package: k8s.io/api
-  version: kubernetes-1.11.0
+  version: kubernetes-1.13.2
 
 # select compatible cobra version for pflags 9ff6c6923cfffbcd502984b8e0c80539a94968b7 used in Kubernetes 1.9
 - package: github.com/spf13/cobra
   version: c439c4fa093711d42e1b01acb1235b52004753c1
 # we need a specific level of jsoniter to match kube
 - package: github.com/json-iterator/go
-  version: f2b4162afba35581b6d4a50d3b8f34e33c144682
+  version: ab8a2e0c74be9d3be70b3184d9acc634935ded82

pkg/cmd/cmd.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/golang/glog"
+	"k8s.io/klog"
 
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/apiserver/pkg/util/logs"
@@ -39,6 +39,6 @@ func RunAdmissionServer(admissionHooks ...AdmissionHook) {
 	cmd := server.NewCommandStartAdmissionServer(os.Stdout, os.Stderr, stopCh, castSlice...)
 	cmd.Flags().AddGoFlagSet(flag.CommandLine)
 	if err := cmd.Execute(); err != nil {
-		glog.Fatal(err)
+		klog.Fatal(err)
 	}
 }

pkg/cmd/server/start.go

@@ -28,7 +28,11 @@ type AdmissionServerOptions struct {
 func NewAdmissionServerOptions(out, errOut io.Writer, admissionHooks ...apiserver.AdmissionHook) *AdmissionServerOptions {
 	o := &AdmissionServerOptions{
 		// TODO we will nil out the etcd storage options.  This requires a later level of k8s.io/apiserver
-		RecommendedOptions: genericoptions.NewRecommendedOptions(defaultEtcdPathPrefix, apiserver.Codecs.LegacyCodec(admissionv1beta1.SchemeGroupVersion)),
+		RecommendedOptions: genericoptions.NewRecommendedOptions(
+			defaultEtcdPathPrefix,
+			apiserver.Codecs.LegacyCodec(admissionv1beta1.SchemeGroupVersion),
+			nil,
+		),
 
 		AdmissionHooks: admissionHooks,
 

pkg/registry/admissionreview/admission_review.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apiserver/pkg/registry/rest"
@@ -37,7 +38,7 @@ func (r *REST) NamespaceScoped() bool {
 	return false
 }
 
-func (r *REST) Create(ctx context.Context, obj runtime.Object, _ rest.ValidateObjectFunc, _ bool) (runtime.Object, error) {
+func (r *REST) Create(ctx context.Context, obj runtime.Object, _ rest.ValidateObjectFunc, _ *metav1.CreateOptions) (runtime.Object, error) {
 	admissionReview := obj.(*admissionv1beta1.AdmissionReview)
 	admissionReview.Response = r.hookFn(admissionReview.Request)
 	return admissionReview, nil