DefaultKubeEffectiveVersion moved compatibility

See kubernetes/kubernetes#129416

Signed-off-by: Nelo-T. Wallus <[email protected]>

Author: ntnn

pkg/server/config.go

@@ -36,11 +36,11 @@ import (
 	"k8s.io/apiserver/pkg/quota/v1/generic"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	serverstorage "k8s.io/apiserver/pkg/server/storage"
+	"k8s.io/apiserver/pkg/util/compatibility"
 	"k8s.io/apiserver/pkg/util/webhook"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/clientcmd"
-	utilversion "k8s.io/component-base/version"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"k8s.io/kubernetes/pkg/controlplane"
 	controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver"
@@ -222,7 +222,7 @@ func NewConfig(ctx context.Context, opts kcpserveroptions.CompletedOptions) (*Co
 	})
 
 	// Set effective version to the default kube version of the vendored libs.
-	c.GenericConfig.EffectiveVersion = utilversion.DefaultKubeEffectiveVersion()
+	c.GenericConfig.EffectiveVersion = compatibility.DefaultBuildEffectiveVersion()
 
 	c.KubeClusterClient, err = kcpkubernetesclientset.NewForConfig(rest.CopyConfig(c.GenericConfig.LoopbackClientConfig))
 	if err != nil {

pkg/virtual/framework/rootapiserver/config.go

@@ -18,8 +18,8 @@ package rootapiserver
 
 import (
 	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/apiserver/pkg/util/compatibility"
 	"k8s.io/client-go/rest"
-	utilversion "k8s.io/component-base/version"
 
 	"github.com/kcp-dev/kcp/pkg/virtual/framework"
 )
@@ -75,7 +75,7 @@ func NewConfig(recommendedConfig *genericapiserver.RecommendedConfig) (*Config,
 	recommendedConfig.Config.LoopbackClientConfig = &rest.Config{
 		Host: "loopback-config-not-wired-for-now",
 	}
-	recommendedConfig.EffectiveVersion = utilversion.DefaultKubeEffectiveVersion()
+	recommendedConfig.EffectiveVersion = compatibility.DefaultBuildEffectiveVersion()
 
 	ret := &Config{
 		Generic: recommendedConfig,