From 0774f779d5cc7beb9ec920bc0cfb285ce294c85f Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Thu, 22 Jun 2023 14:18:34 +0300 Subject: [PATCH] kubeadm: add v1beta4 to the kubeadm API scheme The highest priority is still v1beta3. --- cmd/kubeadm/app/apis/kubeadm/scheme/scheme.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/scheme/scheme.go b/cmd/kubeadm/app/apis/kubeadm/scheme/scheme.go index 19d691f9db4..332fdd4ed83 100644 --- a/cmd/kubeadm/app/apis/kubeadm/scheme/scheme.go +++ b/cmd/kubeadm/app/apis/kubeadm/scheme/scheme.go @@ -25,6 +25,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta4" ) // Scheme is the runtime.Scheme to which all kubeadm api types are registered. @@ -42,5 +43,8 @@ func init() { func AddToScheme(scheme *runtime.Scheme) { utilruntime.Must(kubeadm.AddToScheme(scheme)) utilruntime.Must(v1beta3.AddToScheme(scheme)) - utilruntime.Must(scheme.SetVersionPriority(v1beta3.SchemeGroupVersion)) + utilruntime.Must(v1beta4.AddToScheme(scheme)) + // TODO: https://github.com/kubernetes/kubeadm/issues/2890 + // make v1beta4 highest priority + utilruntime.Must(scheme.SetVersionPriority(v1beta3.SchemeGroupVersion, v1beta4.SchemeGroupVersion)) }