Merge pull request #22 from munnerz/k8s-114

Bump dependencies for Kubernetes 1.14
openshift · Apr 4, 2019 · 90fc1c5 · 90fc1c5
2 parents 55554f0 + a7c51bf
commit 90fc1c5
Show file tree

Hide file tree

Showing 3,371 changed files with 93,159 additions and 359,733 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -1,15 +1,17 @@
 package: github.com/openshift/generic-admission-server
 import:
+- package: k8s.io/component-base
+  version: kubernetes-1.14.0
 - package: k8s.io/code-generator
-  version: kubernetes-1.13.2
+  version: kubernetes-1.14.0
 - package: k8s.io/client-go
-  version: kubernetes-1.13.2
+  version: kubernetes-1.14.0
 - package: k8s.io/apimachinery
-  version: kubernetes-1.13.2
+  version: kubernetes-1.14.0
 - package: k8s.io/apiserver
-  version: kubernetes-1.13.2
+  version: kubernetes-1.14.0
 - package: k8s.io/api
-  version: kubernetes-1.13.2
+  version: kubernetes-1.14.0
 
 # select compatible cobra version for pflags 9ff6c6923cfffbcd502984b8e0c80539a94968b7 used in Kubernetes 1.9
 - package: github.com/spf13/cobra

diff --git a/pkg/cmd/cmd.go b/pkg/cmd/cmd.go
@@ -8,7 +8,7 @@ import (
 	"k8s.io/klog"
 
 	genericapiserver "k8s.io/apiserver/pkg/server"
-	"k8s.io/apiserver/pkg/util/logs"
+	"k8s.io/component-base/logs"
 
 	"github.com/openshift/generic-admission-server/pkg/apiserver"
 	"github.com/openshift/generic-admission-server/pkg/cmd/server"

diff --git a/pkg/cmd/server/start.go b/pkg/cmd/server/start.go
@@ -87,7 +87,7 @@ func (o AdmissionServerOptions) Config() (*apiserver.Config, error) {
 	}
 
 	serverConfig := genericapiserver.NewRecommendedConfig(apiserver.Codecs)
-	if err := o.RecommendedOptions.ApplyTo(serverConfig, apiserver.Scheme); err != nil {
+	if err := o.RecommendedOptions.ApplyTo(serverConfig); err != nil {
 		return nil, err
 	}