karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5177 from RainbowMango/pr_adopt_deprecated_addtoscheme 

Adopt deprecated AddToScheme functions
This commit is contained in:
karmada-bot 2024-07-12 17:50:05 +08:00 committed by GitHub
parent fdc29c7470 5d14b8d254
commit 7f0961f06c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/apis/cluster/install/install.go
View File

@ -18,6 +18,7 @@ package install
import ( import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"github.com/karmada-io/karmada/pkg/apis/cluster" "github.com/karmada-io/karmada/pkg/apis/cluster"
@ -27,6 +28,6 @@ import (
// Install registers the API group and adds types to a scheme. // Install registers the API group and adds types to a scheme.
func Install(scheme *runtime.Scheme) { func Install(scheme *runtime.Scheme) {
utilruntime.Must(cluster.AddToScheme(scheme)) utilruntime.Must(cluster.AddToScheme(scheme))
utilruntime.Must(clusterv1alpha1.AddToScheme(scheme)) utilruntime.Must(clusterv1alpha1.Install(scheme))
utilruntime.Must(scheme.SetVersionPriority(clusterv1alpha1.SchemeGroupVersion)) utilruntime.Must(scheme.SetVersionPriority(schema.GroupVersion{Group: clusterv1alpha1.GroupVersion.Group, Version: clusterv1alpha1.GroupVersion.Version}))
} }

5
pkg/apis/search/install/install.go
View File

@ -18,6 +18,7 @@ package install
import ( import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"github.com/karmada-io/karmada/pkg/apis/search" "github.com/karmada-io/karmada/pkg/apis/search"
@ -27,6 +28,6 @@ import (
// Install registers the API group and adds types to a scheme. // Install registers the API group and adds types to a scheme.
func Install(scheme *runtime.Scheme) { func Install(scheme *runtime.Scheme) {
utilruntime.Must(search.AddToScheme(scheme)) utilruntime.Must(search.AddToScheme(scheme))
utilruntime.Must(searchv1alpha1.AddToScheme(scheme)) utilruntime.Must(searchv1alpha1.Install(scheme))
utilruntime.Must(scheme.SetVersionPriority(searchv1alpha1.SchemeGroupVersion)) utilruntime.Must(scheme.SetVersionPriority(schema.GroupVersion{Group: searchv1alpha1.GroupVersion.Group, Version: searchv1alpha1.GroupVersion.Version}))
} }

9
pkg/resourceinterpreter/customized/webhook/customized.go
View File

@ -53,8 +53,13 @@ type CustomizedInterpreter struct {
// NewCustomizedInterpreter return a new CustomizedInterpreter. // NewCustomizedInterpreter return a new CustomizedInterpreter.
func NewCustomizedInterpreter(informer genericmanager.SingleClusterInformerManager, serviceLister corev1.ServiceLister) (*CustomizedInterpreter, error) { func NewCustomizedInterpreter(informer genericmanager.SingleClusterInformerManager, serviceLister corev1.ServiceLister) (*CustomizedInterpreter, error) {
cm, err := webhookutil.NewClientManager( cm, err := webhookutil.NewClientManager(
[]schema.GroupVersion{configv1alpha1.SchemeGroupVersion}, []schema.GroupVersion{
configv1alpha1.AddToScheme, {
Group: configv1alpha1.GroupVersion.Group,
Version: configv1alpha1.GroupVersion.Version,
},
},
configv1alpha1.Install,
) )
if err != nil { if err != nil {
return nil, err return nil, err

26
pkg/util/gclient/gclient.go
View File

@ -41,19 +41,19 @@ import (
var aggregatedScheme = runtime.NewScheme() var aggregatedScheme = runtime.NewScheme()
func init() { func init() {
utilruntime.Must(scheme.AddToScheme(aggregatedScheme)) // add Kubernetes schemes utilruntime.Must(scheme.AddToScheme(aggregatedScheme)) // add Kubernetes schemes
utilruntime.Must(clusterv1alpha1.AddToScheme(aggregatedScheme)) // add cluster schemes utilruntime.Must(clusterv1alpha1.Install(aggregatedScheme)) // add cluster schemes
utilruntime.Must(configv1alpha1.AddToScheme(aggregatedScheme)) // add config v1alpha1 schemes utilruntime.Must(configv1alpha1.Install(aggregatedScheme)) // add config v1alpha1 schemes
utilruntime.Must(networkingv1alpha1.AddToScheme(aggregatedScheme)) // add network v1alpha1 schemes utilruntime.Must(networkingv1alpha1.Install(aggregatedScheme)) // add network v1alpha1 schemes
utilruntime.Must(policyv1alpha1.AddToScheme(aggregatedScheme)) // add propagation schemes utilruntime.Must(policyv1alpha1.Install(aggregatedScheme)) // add propagation schemes
utilruntime.Must(workv1alpha1.AddToScheme(aggregatedScheme)) // add work v1alpha1 schemes utilruntime.Must(workv1alpha1.Install(aggregatedScheme)) // add work v1alpha1 schemes
utilruntime.Must(workv1alpha2.AddToScheme(aggregatedScheme)) // add work v1alpha2 schemes utilruntime.Must(workv1alpha2.Install(aggregatedScheme)) // add work v1alpha2 schemes
utilruntime.Must(searchv1alpha1.AddToScheme(aggregatedScheme)) // add search v1alpha1 schemes utilruntime.Must(searchv1alpha1.Install(aggregatedScheme)) // add search v1alpha1 schemes
utilruntime.Must(mcsv1alpha1.AddToScheme(aggregatedScheme)) // add mcs-api schemes utilruntime.Must(mcsv1alpha1.Install(aggregatedScheme)) // add mcs-api schemes
utilruntime.Must(clusterapiv1beta1.AddToScheme(aggregatedScheme)) // add cluster-api v1beta1 schemes utilruntime.Must(autoscalingv1alpha1.Install(aggregatedScheme)) // add autoscaling v1alpha1 schemes
utilruntime.Must(autoscalingv1alpha1.AddToScheme(aggregatedScheme)) // add autoscaling v1alpha1 schemes utilruntime.Must(remedyv1alpha1.Install(aggregatedScheme)) // add remedy v1alpha1 schemes
utilruntime.Must(remedyv1alpha1.AddToScheme(aggregatedScheme)) // add remedy v1alpha1 schemes utilruntime.Must(appsv1alpha1.Install(aggregatedScheme)) // add apps v1alpha1 schemes
utilruntime.Must(appsv1alpha1.AddToScheme(aggregatedScheme)) // add apps v1alpha1 schemes utilruntime.Must(clusterapiv1beta1.AddToScheme(aggregatedScheme)) // add cluster-api v1beta1 schemes
} }
// NewSchema returns a singleton schema set which aggregated Kubernetes's schemes and extended schemes. // NewSchema returns a singleton schema set which aggregated Kubernetes's schemes and extended schemes.