Skip to content

Commit

Permalink
Graduate storageVersionHash field in the discovery doc to beta
Browse files Browse the repository at this point in the history
  • Loading branch information
Chao Xu committed May 30, 2019
1 parent 01a5ec3 commit 2f4c273
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 13 deletions.
3 changes: 0 additions & 3 deletions pkg/master/BUILD
View file
Expand Up @@ -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",
Expand Down
7 changes: 1 addition & 6 deletions pkg/master/master_test.go
View file
Expand Up @@ -21,7 +21,6 @@ import (
"crypto/tls"
"encoding/json"
"io/ioutil"
"k8s.io/kubernetes/pkg/apis/networking"
"net"
"net/http"
"net/http/httptest"
Expand All @@ -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"
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down
3 changes: 2 additions & 1 deletion staging/src/k8s.io/apiserver/pkg/features/kube_features.go
View file
Expand Up @@ -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.
Expand Down Expand Up @@ -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},
Expand Down
4 changes: 2 additions & 2 deletions test/cmd/discovery.sh
View file
Expand Up @@ -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
Expand Down Expand Up @@ -127,4 +127,4 @@ run_swagger_tests() {

set +o nounset
set +o errexit
}
}
2 changes: 1 addition & 1 deletion test/e2e/apimachinery/discovery.go
View file
Expand Up @@ -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
Expand Down

0 comments on commit 2f4c273

Please sign in to comment.