github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #124602 from Iceber/fix_discovery_prioritized_versions

Browse Source 
fix the version order of 'discovery.k8s.io'
This commit is contained in:
Kubernetes Prow Robot 2024-05-20 09:12:20 -07:00 committed by GitHub
commit 073c1596f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/discovery/apis__discovery.k8s.io__v1.json
View File

@ -8,7 +8,7 @@
"name": "endpointslices", "name": "endpointslices",
"namespaced": true, "namespaced": true,
"singularName": "endpointslice", "singularName": "endpointslice",
"storageVersionHash": "Nx3SIv6I0mE=", "storageVersionHash": "qgS0xkrxYAI=",
"verbs": [ "verbs": [
"create", "create",
"delete", "delete",

2
pkg/apis/discovery/install/install.go
View File

@ -36,5 +36,5 @@ func Install(scheme *runtime.Scheme) {
utilruntime.Must(discovery.AddToScheme(scheme)) utilruntime.Must(discovery.AddToScheme(scheme))
utilruntime.Must(v1beta1.AddToScheme(scheme)) utilruntime.Must(v1beta1.AddToScheme(scheme))
utilruntime.Must(v1.AddToScheme(scheme)) utilruntime.Must(v1.AddToScheme(scheme))
utilruntime.Must(scheme.SetVersionPriority(v1beta1.SchemeGroupVersion, v1.SchemeGroupVersion)) utilruntime.Must(scheme.SetVersionPriority(v1.SchemeGroupVersion, v1beta1.SchemeGroupVersion))
} }

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

@ -58,7 +58,7 @@ var GVRToStorageVersionHash = map[string]string{
"batch/v1/cronjobs": "sd5LIXh4Fjs=", "batch/v1/cronjobs": "sd5LIXh4Fjs=",
"certificates.k8s.io/v1/certificatesigningrequests": "95fRKMXA+00=", "certificates.k8s.io/v1/certificatesigningrequests": "95fRKMXA+00=",
"coordination.k8s.io/v1/leases": "gqkMMb/YqFM=", "coordination.k8s.io/v1/leases": "gqkMMb/YqFM=",
"discovery.k8s.io/v1/endpointslices": "Nx3SIv6I0mE=", "discovery.k8s.io/v1/endpointslices": "qgS0xkrxYAI=",
"networking.k8s.io/v1/networkpolicies": "YpfwF18m1G8=", "networking.k8s.io/v1/networkpolicies": "YpfwF18m1G8=",
"networking.k8s.io/v1/ingresses": "39NQlfNR+bo=", "networking.k8s.io/v1/ingresses": "39NQlfNR+bo=",
"networking.k8s.io/v1/ingressclasses": "l/iqIbDgFyQ=", "networking.k8s.io/v1/ingressclasses": "l/iqIbDgFyQ=",

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

@ -176,7 +176,6 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes
gvr("discovery.k8s.io", "v1", "endpointslices"): { gvr("discovery.k8s.io", "v1", "endpointslices"): {
Stub: `{"metadata": {"name": "slicev1"}, "addressType": "IPv4", "protocol": "TCP", "ports": [], "endpoints": []}`, Stub: `{"metadata": {"name": "slicev1"}, "addressType": "IPv4", "protocol": "TCP", "ports": [], "endpoints": []}`,
ExpectedEtcdPath: "/registry/endpointslices/" + namespace + "/slicev1", ExpectedEtcdPath: "/registry/endpointslices/" + namespace + "/slicev1",
ExpectedGVK: gvkP("discovery.k8s.io", "v1beta1", "EndpointSlice"),
}, },
// -- // --