@@ -31,22 +31,32 @@ import (
3131 certificatesapiv1beta1 "k8s.io/api/certificates/v1beta1"
3232 apiv1 "k8s.io/api/core/v1"
3333 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
34+ "k8s.io/apimachinery/pkg/runtime/schema"
3435 utilnet "k8s.io/apimachinery/pkg/util/net"
3536 "k8s.io/apimachinery/pkg/util/sets"
3637 "k8s.io/apimachinery/pkg/version"
38+ "k8s.io/apiserver/pkg/authorization/authorizerfactory"
39+ "k8s.io/apiserver/pkg/features"
3740 genericapiserver "k8s.io/apiserver/pkg/server"
3841 "k8s.io/apiserver/pkg/server/options"
42+ "k8s.io/apiserver/pkg/server/resourceconfig"
3943 serverstorage "k8s.io/apiserver/pkg/server/storage"
4044 etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
45+ utilfeature "k8s.io/apiserver/pkg/util/feature"
46+ utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
47+ "k8s.io/client-go/discovery"
4148 "k8s.io/client-go/informers"
4249 "k8s.io/client-go/kubernetes"
4350 "k8s.io/client-go/kubernetes/fake"
4451 restclient "k8s.io/client-go/rest"
4552 "k8s.io/kubernetes/pkg/api/legacyscheme"
4653 "k8s.io/kubernetes/pkg/api/testapi"
54+ "k8s.io/kubernetes/pkg/apis/batch"
4755 api "k8s.io/kubernetes/pkg/apis/core"
56+ apisstorage "k8s.io/kubernetes/pkg/apis/storage"
4857 kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
4958 "k8s.io/kubernetes/pkg/master/reconcilers"
59+ "k8s.io/kubernetes/pkg/master/storageversionhashdata"
5060 certificatesrest "k8s.io/kubernetes/pkg/registry/certificates/rest"
5161 corerest "k8s.io/kubernetes/pkg/registry/core/rest"
5262 "k8s.io/kubernetes/pkg/registry/registrytest"
@@ -70,6 +80,14 @@ func setUp(t *testing.T) (*etcdtesting.EtcdTestServer, Config, *assert.Assertion
7080 }
7181
7282 resourceEncoding := serverstorage .NewDefaultResourceEncodingConfig (legacyscheme .Scheme )
83+ // This configures the testing master the same way the real master is
84+ // configured. The storage versions of these resources are different
85+ // from the storage versions of other resources in their group.
86+ resourceEncodingOverrides := []schema.GroupVersionResource {
87+ batch .Resource ("cronjobs" ).WithVersion ("v1beta1" ),
88+ apisstorage .Resource ("volumeattachments" ).WithVersion ("v1beta1" ),
89+ }
90+ resourceEncoding = resourceconfig .MergeResourceEncodingConfigs (resourceEncoding , resourceEncodingOverrides )
7391 storageFactory := serverstorage .NewDefaultStorageFactory (* storageConfig , testapi .StorageMediaType (), legacyscheme .Codecs , resourceEncoding , DefaultAPIResourceConfigSource (), nil )
7492
7593 etcdOptions := options .NewEtcdOptions (storageConfig )
@@ -81,12 +99,12 @@ func setUp(t *testing.T) (*etcdtesting.EtcdTestServer, Config, *assert.Assertion
8199 }
82100
83101 kubeVersion := kubeversion .Get ()
102+ config .GenericConfig .Authorization .Authorizer = authorizerfactory .NewAlwaysAllowAuthorizer ()
84103 config .GenericConfig .Version = & kubeVersion
85104 config .ExtraConfig .StorageFactory = storageFactory
86105 config .GenericConfig .LoopbackClientConfig = & restclient.Config {APIPath : "/api" , ContentConfig : restclient.ContentConfig {NegotiatedSerializer : legacyscheme .Codecs }}
87106 config .GenericConfig .PublicAddress = net .ParseIP ("192.168.10.4" )
88107 config .GenericConfig .LegacyAPIGroupPrefixes = sets .NewString ("/api" )
89- config .GenericConfig .LoopbackClientConfig = & restclient.Config {APIPath : "/api" , ContentConfig : restclient.ContentConfig {NegotiatedSerializer : legacyscheme .Codecs }}
90108 config .ExtraConfig .KubeletClientConfig = kubeletclient.KubeletClientConfig {Port : 10250 }
91109 config .ExtraConfig .ProxyTransport = utilnet .SetTransportDefaults (& http.Transport {
92110 DialContext : func (ctx context.Context , network , addr string ) (net.Conn , error ) { return nil , nil },
@@ -363,6 +381,112 @@ func TestAPIVersionOfDiscoveryEndpoints(t *testing.T) {
363381
364382}
365383
384+ // This test doesn't cover the apiregistration and apiextensions group, as they are installed by other apiservers.
385+ func TestStorageVersionHashes (t * testing.T ) {
386+ defer utilfeaturetesting .SetFeatureGateDuringTest (t , utilfeature .DefaultFeatureGate , features .StorageVersionHash , true )()
387+ master , etcdserver , _ , _ := newMaster (t )
388+ defer etcdserver .Terminate (t )
389+
390+ server := httptest .NewServer (master .GenericAPIServer .Handler .GoRestfulContainer .ServeMux )
391+
392+ c := & restclient.Config {
393+ Host : server .URL ,
394+ APIPath : "/api" ,
395+ ContentConfig : restclient.ContentConfig {NegotiatedSerializer : legacyscheme .Codecs },
396+ }
397+ discover := discovery .NewDiscoveryClientForConfigOrDie (c )
398+ all , err := discover .ServerResources ()
399+ if err != nil {
400+ t .Error (err )
401+ }
402+ var count int
403+ for _ , g := range all {
404+ for _ , r := range g .APIResources {
405+ if strings .Contains (r .Name , "/" ) ||
406+ storageversionhashdata .NoStorageVersionHash .Has (g .GroupVersion + "/" + r .Name ) {
407+ if r .StorageVersionHash != "" {
408+ t .Errorf ("expect resource %s/%s to have empty storageVersionHash, got hash %q" , g .GroupVersion , r .Name , r .StorageVersionHash )
409+ }
410+ continue
411+ }
412+ if r .StorageVersionHash == "" {
413+ t .Errorf ("expect the storageVersionHash of %s/%s to exist" , g .GroupVersion , r .Name )
414+ continue
415+ }
416+ // Uncomment the following line if you want to update storageversionhash/data.go
417+ // fmt.Printf("\"%s/%s\": \"%s\",\n", g.GroupVersion, r.Name, r.StorageVersionHash)
418+ expected := storageversionhashdata .GVRToStorageVersionHash [g .GroupVersion + "/" + r .Name ]
419+ if r .StorageVersionHash != expected {
420+ t .Errorf ("expect the storageVersionHash of %s/%s to be %q, got %q" , g .GroupVersion , r .Name , expected , r .StorageVersionHash )
421+ }
422+ count ++
423+ }
424+ }
425+ if count != len (storageversionhashdata .GVRToStorageVersionHash ) {
426+ t .Errorf ("please remove the redundant entries from GVRToStorageVersionHash" )
427+ }
428+ }
429+
430+ func TestStorageVersionHashEqualities (t * testing.T ) {
431+ defer utilfeaturetesting .SetFeatureGateDuringTest (t , utilfeature .DefaultFeatureGate , features .StorageVersionHash , true )()
432+ master , etcdserver , _ , assert := newMaster (t )
433+ defer etcdserver .Terminate (t )
434+
435+ server := httptest .NewServer (master .GenericAPIServer .Handler .GoRestfulContainer .ServeMux )
436+
437+ // Test 1: extensions/v1beta1/replicasets and apps/v1/replicasets have
438+ // the same storage version hash.
439+ resp , err := http .Get (server .URL + "/apis/extensions/v1beta1" )
440+ assert .Empty (err )
441+ extList := metav1.APIResourceList {}
442+ assert .NoError (decodeResponse (resp , & extList ))
443+ var extReplicasetHash , appsReplicasetHash string
444+ for _ , r := range extList .APIResources {
445+ if r .Name == "replicasets" {
446+ extReplicasetHash = r .StorageVersionHash
447+ }
448+ }
449+ assert .NotEmpty (extReplicasetHash )
450+
451+ resp , err = http .Get (server .URL + "/apis/apps/v1" )
452+ assert .Empty (err )
453+ appsList := metav1.APIResourceList {}
454+ assert .NoError (decodeResponse (resp , & appsList ))
455+ for _ , r := range appsList .APIResources {
456+ if r .Name == "replicasets" {
457+ appsReplicasetHash = r .StorageVersionHash
458+ }
459+ }
460+ assert .Equal (extReplicasetHash , appsReplicasetHash )
461+
462+ // Test 2: batch/v1/jobs and batch/v1beta1/cronjobs have different
463+ // storage version hashes.
464+ resp , err = http .Get (server .URL + "/apis/batch/v1" )
465+ assert .Empty (err )
466+ batchv1 := metav1.APIResourceList {}
467+ assert .NoError (decodeResponse (resp , & batchv1 ))
468+ var jobsHash string
469+ for _ , r := range batchv1 .APIResources {
470+ if r .Name == "jobs" {
471+ jobsHash = r .StorageVersionHash
472+ }
473+ }
474+ assert .NotEmpty (jobsHash )
475+
476+ resp , err = http .Get (server .URL + "/apis/batch/v1beta1" )
477+ assert .Empty (err )
478+ batchv1beta1 := metav1.APIResourceList {}
479+ assert .NoError (decodeResponse (resp , & batchv1beta1 ))
480+ var cronjobsHash string
481+ for _ , r := range batchv1beta1 .APIResources {
482+ if r .Name == "cronjobs" {
483+ cronjobsHash = r .StorageVersionHash
484+ }
485+ }
486+ assert .NotEmpty (cronjobsHash )
487+ assert .NotEqual (jobsHash , cronjobsHash )
488+ }
489+
366490func TestNoAlphaVersionsEnabledByDefault (t * testing.T ) {
367491 config := DefaultAPIResourceConfigSource ()
368492 for gv , enable := range config .GroupVersionConfigs {
0 commit comments