github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-02-21 22:57:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #133876 from kei01234kei/make_v1_version_fist_priotiry_inresource

Browse Source 
make v1 resource version first priority in resource
This commit is contained in:
Kubernetes Prow Robot
2025-10-07 08:55:02 -07:00
committed by GitHub
parent ad82c3d39f 6d0138d3f1
commit 3a53784ecb
6 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/discovery/apis__resource.k8s.io__v1.json
View File

@@ -8,7 +8,7 @@
"name": "deviceclasses",
"namespaced": false,
"singularName": "deviceclass",
"storageVersionHash": "weQRMT6DeYM=",
"storageVersionHash": "Yk2PTc1Ybxk=",
"verbs": [
"create",
"delete",
@@ -25,7 +25,7 @@
"name": "resourceclaims",
"namespaced": true,
"singularName": "resourceclaim",
"storageVersionHash": "EJAWH5WrAYg=",
"storageVersionHash": "wgAZaHcZxUg=",
"verbs": [
"create",
"delete",
@@ -53,7 +53,7 @@
"name": "resourceclaimtemplates",
"namespaced": true,
"singularName": "resourceclaimtemplate",
"storageVersionHash": "24m0okHrUtk=",
"storageVersionHash": "TuzjC49aUfM=",
"verbs": [
"create",
"delete",
@@ -70,7 +70,7 @@
"name": "resourceslices",
"namespaced": false,
"singularName": "resourceslice",
"storageVersionHash": "z6Bc9vgk6yE=",
"storageVersionHash": "KsC072WgaEY=",
"verbs": [
"create",
"delete",

8
api/discovery/apis__resource.k8s.io__v1beta1.json
View File

@@ -8,7 +8,7 @@
"name": "deviceclasses",
"namespaced": false,
"singularName": "deviceclass",
"storageVersionHash": "weQRMT6DeYM=",
"storageVersionHash": "Yk2PTc1Ybxk=",
"verbs": [
"create",
"delete",
@@ -25,7 +25,7 @@
"name": "resourceclaims",
"namespaced": true,
"singularName": "resourceclaim",
"storageVersionHash": "EJAWH5WrAYg=",
"storageVersionHash": "wgAZaHcZxUg=",
"verbs": [
"create",
"delete",
@@ -53,7 +53,7 @@
"name": "resourceclaimtemplates",
"namespaced": true,
"singularName": "resourceclaimtemplate",
"storageVersionHash": "24m0okHrUtk=",
"storageVersionHash": "TuzjC49aUfM=",
"verbs": [
"create",
"delete",
@@ -70,7 +70,7 @@
"name": "resourceslices",
"namespaced": false,
"singularName": "resourceslice",
"storageVersionHash": "z6Bc9vgk6yE=",
"storageVersionHash": "KsC072WgaEY=",
"verbs": [
"create",
"delete",

8
api/discovery/apis__resource.k8s.io__v1beta2.json
View File

@@ -8,7 +8,7 @@
"name": "deviceclasses",
"namespaced": false,
"singularName": "deviceclass",
"storageVersionHash": "weQRMT6DeYM=",
"storageVersionHash": "Yk2PTc1Ybxk=",
"verbs": [
"create",
"delete",
@@ -25,7 +25,7 @@
"name": "resourceclaims",
"namespaced": true,
"singularName": "resourceclaim",
"storageVersionHash": "EJAWH5WrAYg=",
"storageVersionHash": "wgAZaHcZxUg=",
"verbs": [
"create",
"delete",
@@ -53,7 +53,7 @@
"name": "resourceclaimtemplates",
"namespaced": true,
"singularName": "resourceclaimtemplate",
"storageVersionHash": "24m0okHrUtk=",
"storageVersionHash": "TuzjC49aUfM=",
"verbs": [
"create",
"delete",
@@ -70,7 +70,7 @@
"name": "resourceslices",
"namespaced": false,
"singularName": "resourceslice",
"storageVersionHash": "z6Bc9vgk6yE=",
"storageVersionHash": "KsC072WgaEY=",
"verbs": [
"create",
"delete",

3
pkg/apis/resource/install/install.go
View File

@@ -40,6 +40,5 @@ func Install(scheme *runtime.Scheme) {
utilruntime.Must(v1beta1.AddToScheme(scheme))
utilruntime.Must(v1beta2.AddToScheme(scheme))
utilruntime.Must(v1.AddToScheme(scheme))
// TODO (https://github.com/kubernetes/kubernetes/issues/133131): put v1 first in 1.35
utilruntime.Must(scheme.SetVersionPriority(v1beta2.SchemeGroupVersion, v1.SchemeGroupVersion, v1beta1.SchemeGroupVersion, v1alpha3.SchemeGroupVersion))
utilruntime.Must(scheme.SetVersionPriority(v1.SchemeGroupVersion, v1beta2.SchemeGroupVersion, v1beta1.SchemeGroupVersion, v1alpha3.SchemeGroupVersion))
}

8
pkg/controlplane/storageversionhashdata/data.go
View File

@@ -70,10 +70,10 @@ var GVRToStorageVersionHash = map[string]string{
"rbac.authorization.k8s.io/v1/clusterroles": "bYE5ZWDrJ44=",
"rbac.authorization.k8s.io/v1/rolebindings": "eGsCzGH6b1g=",
"rbac.authorization.k8s.io/v1/roles": "7FuwZcIIItM=",
"resource.k8s.io/v1/deviceclasses": "weQRMT6DeYM=",
"resource.k8s.io/v1/resourceclaims": "EJAWH5WrAYg=",
"resource.k8s.io/v1/resourceclaimtemplates": "24m0okHrUtk=",
"resource.k8s.io/v1/resourceslices": "z6Bc9vgk6yE=",
"resource.k8s.io/v1/deviceclasses": "Yk2PTc1Ybxk=",
"resource.k8s.io/v1/resourceclaims": "wgAZaHcZxUg=",
"resource.k8s.io/v1/resourceclaimtemplates": "TuzjC49aUfM=",
"resource.k8s.io/v1/resourceslices": "KsC072WgaEY=",
"scheduling.k8s.io/v1/priorityclasses": "1QwjyaZjj3Y=",
"storage.k8s.io/v1/csidrivers": "hL6j/rwBV5w=",
"storage.k8s.io/v1/csinodes": "Pe62DkZtjuo=",

24
test/integration/etcd/data.go
View File

@@ -586,28 +586,28 @@ func GetEtcdStorageDataForNamespaceServedAt(namespace string, v string, isEmulat
gvr("resource.k8s.io", "v1beta1", "deviceclasses"): {
Stub: `{"metadata": {"name": "class2name"}}`,
ExpectedEtcdPath: "/registry/deviceclasses/class2name",
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "DeviceClass"),
ExpectedGVK: gvkP("resource.k8s.io", "v1", "DeviceClass"),
IntroducedVersion: "1.32",
RemovedVersion: "1.38",
},
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", "v1beta2", "ResourceClaim"),
ExpectedGVK: gvkP("resource.k8s.io", "v1", "ResourceClaim"),
IntroducedVersion: "1.32",
RemovedVersion: "1.38",
},
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", "v1beta2", "ResourceClaimTemplate"),
ExpectedGVK: gvkP("resource.k8s.io", "v1", "ResourceClaimTemplate"),
IntroducedVersion: "1.32",
RemovedVersion: "1.38",
},
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", "v1beta2", "ResourceSlice"),
ExpectedGVK: gvkP("resource.k8s.io", "v1", "ResourceSlice"),
IntroducedVersion: "1.32",
RemovedVersion: "1.38",
},
@@ -620,28 +620,28 @@ func GetEtcdStorageDataForNamespaceServedAt(namespace string, v string, isEmulat
gvr("resource.k8s.io", "v1beta2", "deviceclasses"): {
Stub: `{"metadata": {"name": "class3name"}}`,
ExpectedEtcdPath: "/registry/deviceclasses/class3name",
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "DeviceClass"),
ExpectedGVK: gvkP("resource.k8s.io", "v1", "DeviceClass"),
IntroducedVersion: "1.33",
RemovedVersion: "1.39",
},
gvr("resource.k8s.io", "v1beta2", "resourceclaims"): {
Stub: `{"metadata": {"name": "claim3name"}, "spec": {"devices": {"requests": [{"name": "req-0", "exactly": {"deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}}]}}}`,
ExpectedEtcdPath: "/registry/resourceclaims/" + namespace + "/claim3name",
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceClaim"),
ExpectedGVK: gvkP("resource.k8s.io", "v1", "ResourceClaim"),
IntroducedVersion: "1.33",
RemovedVersion: "1.39",
},
gvr("resource.k8s.io", "v1beta2", "resourceclaimtemplates"): {
Stub: `{"metadata": {"name": "claimtemplate3name"}, "spec": {"spec": {"devices": {"requests": [{"name": "req-0", "exactly": {"deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}}]}}}}`,
ExpectedEtcdPath: "/registry/resourceclaimtemplates/" + namespace + "/claimtemplate3name",
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceClaimTemplate"),
ExpectedGVK: gvkP("resource.k8s.io", "v1", "ResourceClaimTemplate"),
IntroducedVersion: "1.33",
RemovedVersion: "1.39",
},
gvr("resource.k8s.io", "v1beta2", "resourceslices"): {
Stub: `{"metadata": {"name": "node3slice"}, "spec": {"nodeName": "worker1", "driver": "dra.example.com", "pool": {"name": "worker1", "resourceSliceCount": 1}}}`,
ExpectedEtcdPath: "/registry/resourceslices/node3slice",
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceSlice"),
ExpectedGVK: gvkP("resource.k8s.io", "v1", "ResourceSlice"),
IntroducedVersion: "1.33",
RemovedVersion: "1.39",
},
@@ -651,25 +651,25 @@ func GetEtcdStorageDataForNamespaceServedAt(namespace string, v string, isEmulat
gvr("resource.k8s.io", "v1", "deviceclasses"): {
Stub: `{"metadata": {"name": "class4name"}}`,
ExpectedEtcdPath: "/registry/deviceclasses/class4name",
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "DeviceClass"),
ExpectedGVK: gvkP("resource.k8s.io", "v1", "DeviceClass"),
IntroducedVersion: "1.34",
},
gvr("resource.k8s.io", "v1", "resourceclaims"): {
Stub: `{"metadata": {"name": "claim4name"}, "spec": {"devices": {"requests": [{"name": "req-0", "exactly": {"deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}}]}}}`,
ExpectedEtcdPath: "/registry/resourceclaims/" + namespace + "/claim4name",
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceClaim"),
ExpectedGVK: gvkP("resource.k8s.io", "v1", "ResourceClaim"),
IntroducedVersion: "1.34",
},
gvr("resource.k8s.io", "v1", "resourceclaimtemplates"): {
Stub: `{"metadata": {"name": "claimtemplate4name"}, "spec": {"spec": {"devices": {"requests": [{"name": "req-0", "exactly": {"deviceClassName": "example-class", "allocationMode": "ExactCount", "count": 1}}]}}}}`,
ExpectedEtcdPath: "/registry/resourceclaimtemplates/" + namespace + "/claimtemplate4name",
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceClaimTemplate"),
ExpectedGVK: gvkP("resource.k8s.io", "v1", "ResourceClaimTemplate"),
IntroducedVersion: "1.34",
},
gvr("resource.k8s.io", "v1", "resourceslices"): {
Stub: `{"metadata": {"name": "node4slice"}, "spec": {"nodeName": "worker1", "driver": "dra.example.com", "pool": {"name": "worker1", "resourceSliceCount": 1}}}`,
ExpectedEtcdPath: "/registry/resourceslices/node4slice",
ExpectedGVK: gvkP("resource.k8s.io", "v1beta2", "ResourceSlice"),
ExpectedGVK: gvkP("resource.k8s.io", "v1", "ResourceSlice"),
IntroducedVersion: "1.34",
},
// --