Merge pull request #78325 from caesarxuchao/storageVersionHash-beta

Graduate storageVersionHash field in the discovery doc to beta

Kubernetes-commit: d817a7e9a0e449c997c743526db43c9d718c6364
This commit is contained in:
Kubernetes Publisher 2019-05-31 23:22:33 -07:00
commit da0bf83195
4 changed files with 6 additions and 5 deletions

2
Godeps/Godeps.json generated
View File

@ -408,7 +408,7 @@
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "103ccccb7a11"
"Rev": "4ec519775454"
},
{
"ImportPath": "k8s.io/klog",

4
go.mod
View File

@ -60,7 +60,7 @@ require (
k8s.io/api v0.0.0-20190602125758-0b6636a6b587
k8s.io/apimachinery v0.0.0-20190602125621-c0632ccbde11
k8s.io/client-go v0.0.0-20190531132439-88ff0afc48bb
k8s.io/component-base v0.0.0-20190531133342-103ccccb7a11
k8s.io/component-base v0.0.0-20190602130718-4ec519775454
k8s.io/klog v0.3.2
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
k8s.io/utils v0.0.0-20190221042446-c2654d5206da
@ -75,5 +75,5 @@ replace (
k8s.io/api => k8s.io/api v0.0.0-20190602125758-0b6636a6b587
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190602125621-c0632ccbde11
k8s.io/client-go => k8s.io/client-go v0.0.0-20190531132439-88ff0afc48bb
k8s.io/component-base => k8s.io/component-base v0.0.0-20190531133342-103ccccb7a11
k8s.io/component-base => k8s.io/component-base v0.0.0-20190602130718-4ec519775454
)

2
go.sum
View File

@ -195,7 +195,7 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
k8s.io/api v0.0.0-20190602125758-0b6636a6b587/go.mod h1:6v+AckiDRrvZFUHXmDOahi8suThDPhjRhq47xjNtGtM=
k8s.io/apimachinery v0.0.0-20190602125621-c0632ccbde11/go.mod h1:u/2VL7tgEMV0FFTV9q0JO+7cnTsV44LP8Pmx41R4AQ4=
k8s.io/client-go v0.0.0-20190531132439-88ff0afc48bb/go.mod h1:oBWDlQWEpK7nPTuJljTF4w6W/zjopIHAPOJu70zfOHE=
k8s.io/component-base v0.0.0-20190531133342-103ccccb7a11/go.mod h1:frt5HHKRohojf4/1IKHxe/Zjd0eYBrP9LRsKkfWt9Fc=
k8s.io/component-base v0.0.0-20190602130718-4ec519775454/go.mod h1:bS4Et9rV53C0WG/JRa+efnzveAUGHN+6XuIC9ZgGDkc=
k8s.io/klog v0.3.2 h1:qvP/U6CcZ6qyi/qSHlJKdlAboCzo3mT0DAm0XAarpz4=
k8s.io/klog v0.3.2/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=

View File

@ -94,6 +94,7 @@ const (
// owner: @caesarxuchao
// alpha: v1.14
// beta: v1.15
//
// Allow apiservers to expose the storage version hash in the discovery
// document.
@ -141,7 +142,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
APIListChunking: {Default: true, PreRelease: featuregate.Beta},
DryRun: {Default: true, PreRelease: featuregate.Beta},
ServerSideApply: {Default: false, PreRelease: featuregate.Alpha},
StorageVersionHash: {Default: false, PreRelease: featuregate.Alpha},
StorageVersionHash: {Default: true, PreRelease: featuregate.Beta},
WinOverlay: {Default: false, PreRelease: featuregate.Alpha},
WinDSR: {Default: false, PreRelease: featuregate.Alpha},
WatchBookmark: {Default: false, PreRelease: featuregate.Alpha},