diff --git a/pkg/apis/resource/install/install.go b/pkg/apis/resource/install/install.go index be85f811a67..e473b8f5486 100644 --- a/pkg/apis/resource/install/install.go +++ b/pkg/apis/resource/install/install.go @@ -36,5 +36,5 @@ func Install(scheme *runtime.Scheme) { utilruntime.Must(resource.AddToScheme(scheme)) utilruntime.Must(v1alpha3.AddToScheme(scheme)) utilruntime.Must(v1beta1.AddToScheme(scheme)) - utilruntime.Must(scheme.SetVersionPriority(v1alpha3.SchemeGroupVersion)) + utilruntime.Must(scheme.SetVersionPriority(v1beta1.SchemeGroupVersion, v1alpha3.SchemeGroupVersion)) } diff --git a/test/integration/etcd/data.go b/test/integration/etcd/data.go index 7af2a1bd500..285297d5a95 100644 --- a/test/integration/etcd/data.go +++ b/test/integration/etcd/data.go @@ -430,18 +430,22 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes gvr("resource.k8s.io", "v1alpha3", "deviceclasses"): { Stub: `{"metadata": {"name": "class1name"}}`, ExpectedEtcdPath: "/registry/deviceclasses/class1name", + ExpectedGVK: gvkP("resource.k8s.io", "v1beta1", "DeviceClass"), }, gvr("resource.k8s.io", "v1alpha3", "resourceclaims"): { Stub: `{"metadata": {"name": "claim1name"}, "spec": {"devices": {"requests": [{"name": "req-0", "deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}]}}}`, ExpectedEtcdPath: "/registry/resourceclaims/" + namespace + "/claim1name", + ExpectedGVK: gvkP("resource.k8s.io", "v1beta1", "ResourceClaim"), }, gvr("resource.k8s.io", "v1alpha3", "resourceclaimtemplates"): { Stub: `{"metadata": {"name": "claimtemplate1name"}, "spec": {"spec": {"devices": {"requests": [{"name": "req-0", "deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}]}}}}`, ExpectedEtcdPath: "/registry/resourceclaimtemplates/" + namespace + "/claimtemplate1name", + ExpectedGVK: gvkP("resource.k8s.io", "v1beta1", "ResourceClaimTemplate"), }, gvr("resource.k8s.io", "v1alpha3", "resourceslices"): { Stub: `{"metadata": {"name": "node1slice"}, "spec": {"nodeName": "worker1", "driver": "dra.example.com", "pool": {"name": "worker1", "resourceSliceCount": 1}}}`, ExpectedEtcdPath: "/registry/resourceslices/node1slice", + ExpectedGVK: gvkP("resource.k8s.io", "v1beta1", "ResourceSlice"), }, // -- @@ -449,22 +453,18 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes gvr("resource.k8s.io", "v1beta1", "deviceclasses"): { Stub: `{"metadata": {"name": "class2name"}}`, ExpectedEtcdPath: "/registry/deviceclasses/class2name", - ExpectedGVK: gvkP("resource.k8s.io", "v1alpha3", "DeviceClass"), }, gvr("resource.k8s.io", "v1beta1", "resourceclaims"): { Stub: `{"metadata": {"name": "claim2name"}, "spec": {"devices": {"requests": [{"name": "req-0", "deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}]}}}`, ExpectedEtcdPath: "/registry/resourceclaims/" + namespace + "/claim2name", - ExpectedGVK: gvkP("resource.k8s.io", "v1alpha3", "ResourceClaim"), }, gvr("resource.k8s.io", "v1beta1", "resourceclaimtemplates"): { Stub: `{"metadata": {"name": "claimtemplate2name"}, "spec": {"spec": {"devices": {"requests": [{"name": "req-0", "deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}]}}}}`, ExpectedEtcdPath: "/registry/resourceclaimtemplates/" + namespace + "/claimtemplate2name", - ExpectedGVK: gvkP("resource.k8s.io", "v1alpha3", "ResourceClaimTemplate"), }, gvr("resource.k8s.io", "v1beta1", "resourceslices"): { Stub: `{"metadata": {"name": "node2slice"}, "spec": {"nodeName": "worker1", "driver": "dra.example.com", "pool": {"name": "worker1", "resourceSliceCount": 1}}}`, ExpectedEtcdPath: "/registry/resourceslices/node2slice", - ExpectedGVK: gvkP("resource.k8s.io", "v1alpha3", "ResourceSlice"), }, // --