From df0c16e2efa6667cb29486b3be091eac170dc69e Mon Sep 17 00:00:00 2001 From: Iceber Gu Date: Mon, 29 Apr 2024 09:59:54 +0800 Subject: [PATCH] fix the version order of 'discovery.k8s.io' Signed-off-by: Iceber Gu (cherry picked from commit 4297e74c9ff5a4e8912ce8214e07cd35a3a43e7f) Signed-off-by: Iceber Gu --- pkg/scheme/import_known_versions.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/scheme/import_known_versions.go b/pkg/scheme/import_known_versions.go index d0c66d182..5c087c492 100644 --- a/pkg/scheme/import_known_versions.go +++ b/pkg/scheme/import_known_versions.go @@ -3,6 +3,7 @@ package scheme import ( // These imports are the API groups the API server will support. apiextensionsinstall "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" apiregistrationinstall "k8s.io/kube-aggregator/pkg/apis/apiregistration/install" _ "k8s.io/kubernetes/pkg/apis/admission/install" _ "k8s.io/kubernetes/pkg/apis/admissionregistration/install" @@ -16,6 +17,8 @@ import ( _ "k8s.io/kubernetes/pkg/apis/coordination/install" _ "k8s.io/kubernetes/pkg/apis/core/install" _ "k8s.io/kubernetes/pkg/apis/discovery/install" + v1 "k8s.io/kubernetes/pkg/apis/discovery/v1" + "k8s.io/kubernetes/pkg/apis/discovery/v1beta1" _ "k8s.io/kubernetes/pkg/apis/events/install" _ "k8s.io/kubernetes/pkg/apis/extensions/install" _ "k8s.io/kubernetes/pkg/apis/flowcontrol/install" @@ -32,4 +35,7 @@ import ( func init() { apiextensionsinstall.Install(LegacyResourceScheme) apiregistrationinstall.Install(LegacyResourceScheme) + + // Fix the version order of 'discovery.k8s.io' resources + utilruntime.Must(LegacyResourceScheme.SetVersionPriority(v1.SchemeGroupVersion, v1beta1.SchemeGroupVersion)) }