github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40663 from sttts/sttts-readd-generic-features

Browse Source 
Automatic merge from submit-queue

pkg/genericapiserver: re-add generic feature gates

https://github.com/kubernetes/kubernetes/pull/40543 removed the kubernetes feature gates (which subsume the generic ones) from genericapiserver. This PR readds the generic ones again.

This is not strictly necessary for kube-apiserver. But some other downstream project without its own feature gates needs this.
This commit is contained in:
Kubernetes Submit Queue 2017-01-30 05:11:49 -08:00 committed by GitHub
commit 6e92d41a83
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/genericapiserver/server/options/BUILD
View File

@ -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",

3
pkg/genericapiserver/server/options/server_run_options.go
View File

@ -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"
)