From 2f4c273398336008e4852796e9453f02add4849c Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Fri, 24 May 2019 17:22:05 -0700 Subject: [PATCH] Graduate storageVersionHash field in the discovery doc to beta --- pkg/master/BUILD | 3 --- pkg/master/master_test.go | 7 +------ staging/src/k8s.io/apiserver/pkg/features/kube_features.go | 3 ++- test/cmd/discovery.sh | 4 ++-- test/e2e/apimachinery/discovery.go | 2 +- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 3cc092af54..a65878f3c5 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -166,20 +166,17 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library", "//staging/src/k8s.io/apiserver/pkg/authorization/authorizerfactory:go_default_library", "//staging/src/k8s.io/apiserver/pkg/endpoints/openapi:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/features:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/resourceconfig:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/storage:go_default_library", "//staging/src/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", - "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library", "//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", - "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", "//vendor/github.com/go-openapi/loads:go_default_library", "//vendor/github.com/go-openapi/spec:go_default_library", "//vendor/github.com/go-openapi/strfmt:go_default_library", diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 9d842d8b7a..0d023c49a6 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -21,7 +21,6 @@ import ( "crypto/tls" "encoding/json" "io/ioutil" - "k8s.io/kubernetes/pkg/apis/networking" "net" "net/http" "net/http/httptest" @@ -37,22 +36,20 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/version" "k8s.io/apiserver/pkg/authorization/authorizerfactory" - "k8s.io/apiserver/pkg/features" genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/options" "k8s.io/apiserver/pkg/server/resourceconfig" serverstorage "k8s.io/apiserver/pkg/server/storage" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" - utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/client-go/discovery" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" restclient "k8s.io/client-go/rest" - featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/batch" + "k8s.io/kubernetes/pkg/apis/networking" apisstorage "k8s.io/kubernetes/pkg/apis/storage" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/reconcilers" @@ -378,7 +375,6 @@ func TestAPIVersionOfDiscoveryEndpoints(t *testing.T) { // This test doesn't cover the apiregistration and apiextensions group, as they are installed by other apiservers. func TestStorageVersionHashes(t *testing.T) { - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.StorageVersionHash, true)() master, etcdserver, _, _ := newMaster(t) defer etcdserver.Terminate(t) @@ -423,7 +419,6 @@ func TestStorageVersionHashes(t *testing.T) { } func TestStorageVersionHashEqualities(t *testing.T) { - defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.StorageVersionHash, true)() master, etcdserver, _, assert := newMaster(t) defer etcdserver.Terminate(t) diff --git a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go index f74fb108db..16ee168af9 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -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}, diff --git a/test/cmd/discovery.sh b/test/cmd/discovery.sh index 7fc8096c29..cc8a731175 100755 --- a/test/cmd/discovery.sh +++ b/test/cmd/discovery.sh @@ -55,7 +55,7 @@ run_assert_short_name_tests() { output_message=$(kubectl get --raw=/api/v1) ## test if a short name is exported during discovery - kube::test::if_has_string "${output_message}" '{"name":"configmaps","singularName":"","namespaced":true,"kind":"ConfigMap","verbs":\["create","delete","deletecollection","get","list","patch","update","watch"\],"shortNames":\["cm"\]}' + kube::test::if_has_string "${output_message}" '{"name":"configmaps","singularName":"","namespaced":true,"kind":"ConfigMap","verbs":\["create","delete","deletecollection","get","list","patch","update","watch"\],"shortNames":\["cm"\],"storageVersionHash":' set +o nounset set +o errexit @@ -127,4 +127,4 @@ run_swagger_tests() { set +o nounset set +o errexit -} \ No newline at end of file +} diff --git a/test/e2e/apimachinery/discovery.go b/test/e2e/apimachinery/discovery.go index 034db8c7b8..b17d582a4c 100644 --- a/test/e2e/apimachinery/discovery.go +++ b/test/e2e/apimachinery/discovery.go @@ -40,7 +40,7 @@ var _ = SIGDescribe("Discovery", func() { setupServerCert(namespaceName, serviceName) }) - ginkgo.It("[Feature:StorageVersionHash] Custom resource should have storage version hash", func() { + ginkgo.It("Custom resource should have storage version hash", func() { testcrd, err := crd.CreateTestCRD(f) if err != nil { return