kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #76087 from sttts/sttts-fail-feature-gate-errors 

Handle feature gate errors

Kubernetes-commit: 4e728efbd6d3e389cf97463f064613d1b4d6d419
This commit is contained in:
Kubernetes Publisher 2019-04-03 21:07:24 -07:00
parent fb0d7b20d1 541d02b251
commit bf0cd89bc4
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -452,7 +452,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "1300bc81aae5"
"Rev": "2a3e58aa7026"
},
{
"ImportPath": "k8s.io/component-base",

4
go.mod
View File

@ -68,7 +68,7 @@ require (
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20190404065945-709cf190c7b7
k8s.io/apimachinery v0.0.0-20190404065847-4a4abcd45006
k8s.io/client-go v0.0.0-20190404070122-1300bc81aae5
k8s.io/client-go v0.0.0-20190404070124-2a3e58aa7026
k8s.io/component-base v0.0.0-20190404070505-d7891e8054ca
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
@ -332,7 +332,7 @@ replace (
gotest.tools => gotest.tools v2.2.0+incompatible
k8s.io/api => k8s.io/api v0.0.0-20190404065945-709cf190c7b7
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190404065847-4a4abcd45006
k8s.io/client-go => k8s.io/client-go v0.0.0-20190404070122-1300bc81aae5
k8s.io/client-go => k8s.io/client-go v0.0.0-20190404070124-2a3e58aa7026
k8s.io/component-base => k8s.io/component-base v0.0.0-20190404070505-d7891e8054ca
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1

2
go.sum
View File

@ -197,7 +197,7 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
k8s.io/api v0.0.0-20190404065945-709cf190c7b7/go.mod h1:qa6Gt7knwxwD/MXwV8iaEoTpniVksiix/r9hpLWYgTA=
k8s.io/apimachinery v0.0.0-20190404065847-4a4abcd45006/go.mod h1:65NCMCFo27j/Cv2DAQSfKd70SAtu/hwoqasuXFCDNvY=
k8s.io/client-go v0.0.0-20190404070122-1300bc81aae5/go.mod h1:bIEHXHbykaOlj+pgLllzLJ2RPGdzkjtqdk0Il07KPEM=
k8s.io/client-go v0.0.0-20190404070124-2a3e58aa7026/go.mod h1:bIEHXHbykaOlj+pgLllzLJ2RPGdzkjtqdk0Il07KPEM=
k8s.io/component-base v0.0.0-20190404070505-d7891e8054ca/go.mod h1:+NvN1jZolC6PvCu9KtpLJETeov4QYehdKLMwZ0yo0Zg=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 h1:SHucoAy7lRb+w5oC/hbXyZg+zX+Wftn6hD4tGzHCVqA=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

4
pkg/features/kube_features.go
View File

@ -17,6 +17,8 @@ limitations under the License.
package features
import (
"k8s.io/apimachinery/pkg/util/runtime"
utilfeature "k8s.io/apiserver/pkg/util/feature"
)
@ -110,7 +112,7 @@ const (
)
func init() {
utilfeature.DefaultMutableFeatureGate.Add(defaultKubernetesFeatureGates)
runtime.Must(utilfeature.DefaultMutableFeatureGate.Add(defaultKubernetesFeatureGates))
}
// defaultKubernetesFeatureGates consists of all known Kubernetes-specific feature keys.