From b500b744ce292b67fbfc3fb64d7e9b9a5a56c4ae Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Sun, 29 Jan 2017 19:31:43 +0100 Subject: [PATCH] pkg/genericapiserver: re-add generic feature gates --- pkg/genericapiserver/server/options/BUILD | 1 + pkg/genericapiserver/server/options/server_run_options.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkg/genericapiserver/server/options/BUILD b/pkg/genericapiserver/server/options/BUILD index 91351010d6..e7fdf7a7ae 100644 --- a/pkg/genericapiserver/server/options/BUILD +++ b/pkg/genericapiserver/server/options/BUILD @@ -28,6 +28,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/admission", "//vendor:k8s.io/apiserver/pkg/authentication/authenticatorfactory", "//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory", + "//vendor:k8s.io/apiserver/pkg/features", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/apiserver/pkg/util/feature", "//vendor:k8s.io/apiserver/pkg/util/flag", diff --git a/pkg/genericapiserver/server/options/server_run_options.go b/pkg/genericapiserver/server/options/server_run_options.go index a0a338815b..5b2a007904 100644 --- a/pkg/genericapiserver/server/options/server_run_options.go +++ b/pkg/genericapiserver/server/options/server_run_options.go @@ -28,6 +28,9 @@ import ( utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/pkg/api" + // add the generic feature gates + _ "k8s.io/apiserver/pkg/features" + "github.com/spf13/pflag" )