From 4afcabe5f1146e8d4489b5651acb076bf1e150a7 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Mon, 25 Jan 2021 10:39:08 +0800 Subject: [PATCH] rename apigroup name, from propagationstrategy to policy Signed-off-by: Kevin Wang --- .../{propagationstrategy => policy}/v1alpha1/binding_types.go | 0 pkg/apis/{propagationstrategy => policy}/v1alpha1/doc.go | 2 +- .../{propagationstrategy => policy}/v1alpha1/override_types.go | 0 .../v1alpha1/propagation_types.go | 0 pkg/apis/{propagationstrategy => policy}/v1alpha1/work_types.go | 0 .../v1alpha1/zz_generated.deepcopy.go | 0 .../v1alpha1/zz_generated.register.go | 2 +- pkg/controllers/binding/binding_controller.go | 2 +- pkg/controllers/execution/execution_controller.go | 2 +- pkg/controllers/policy/policy_controller.go | 2 +- pkg/controllers/status/workstatus_controller.go | 2 +- pkg/karmadactl/join.go | 2 +- pkg/scheduler/core/generic_shceduler.go | 2 +- pkg/scheduler/framework/interface.go | 2 +- .../framework/plugins/clusteraffinity/cluster_affinity.go | 2 +- pkg/scheduler/framework/runtime/framework.go | 2 +- pkg/scheduler/scheduler.go | 2 +- pkg/util/gclient/gclient.go | 2 +- pkg/util/overridemanager/overridemanager.go | 2 +- pkg/util/selector.go | 2 +- pkg/webhook/overridepolicy/mutating.go | 2 +- samples/nginx/propagationpolicy.yaml | 2 +- test/helper/propagationpolicy.go | 2 +- 23 files changed, 18 insertions(+), 18 deletions(-) rename pkg/apis/{propagationstrategy => policy}/v1alpha1/binding_types.go (100%) rename pkg/apis/{propagationstrategy => policy}/v1alpha1/doc.go (71%) rename pkg/apis/{propagationstrategy => policy}/v1alpha1/override_types.go (100%) rename pkg/apis/{propagationstrategy => policy}/v1alpha1/propagation_types.go (100%) rename pkg/apis/{propagationstrategy => policy}/v1alpha1/work_types.go (100%) rename pkg/apis/{propagationstrategy => policy}/v1alpha1/zz_generated.deepcopy.go (100%) rename pkg/apis/{propagationstrategy => policy}/v1alpha1/zz_generated.register.go (97%) diff --git a/pkg/apis/propagationstrategy/v1alpha1/binding_types.go b/pkg/apis/policy/v1alpha1/binding_types.go similarity index 100% rename from pkg/apis/propagationstrategy/v1alpha1/binding_types.go rename to pkg/apis/policy/v1alpha1/binding_types.go diff --git a/pkg/apis/propagationstrategy/v1alpha1/doc.go b/pkg/apis/policy/v1alpha1/doc.go similarity index 71% rename from pkg/apis/propagationstrategy/v1alpha1/doc.go rename to pkg/apis/policy/v1alpha1/doc.go index 03985ed48..cd686c0d3 100644 --- a/pkg/apis/propagationstrategy/v1alpha1/doc.go +++ b/pkg/apis/policy/v1alpha1/doc.go @@ -1,4 +1,4 @@ // Package v1alpha1 is the v1alpha1 version of the API. // +k8s:deepcopy-gen=package,register -// +groupName=propagationstrategy.karmada.io +// +groupName=policy.karmada.io package v1alpha1 diff --git a/pkg/apis/propagationstrategy/v1alpha1/override_types.go b/pkg/apis/policy/v1alpha1/override_types.go similarity index 100% rename from pkg/apis/propagationstrategy/v1alpha1/override_types.go rename to pkg/apis/policy/v1alpha1/override_types.go diff --git a/pkg/apis/propagationstrategy/v1alpha1/propagation_types.go b/pkg/apis/policy/v1alpha1/propagation_types.go similarity index 100% rename from pkg/apis/propagationstrategy/v1alpha1/propagation_types.go rename to pkg/apis/policy/v1alpha1/propagation_types.go diff --git a/pkg/apis/propagationstrategy/v1alpha1/work_types.go b/pkg/apis/policy/v1alpha1/work_types.go similarity index 100% rename from pkg/apis/propagationstrategy/v1alpha1/work_types.go rename to pkg/apis/policy/v1alpha1/work_types.go diff --git a/pkg/apis/propagationstrategy/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/policy/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/propagationstrategy/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/policy/v1alpha1/zz_generated.deepcopy.go diff --git a/pkg/apis/propagationstrategy/v1alpha1/zz_generated.register.go b/pkg/apis/policy/v1alpha1/zz_generated.register.go similarity index 97% rename from pkg/apis/propagationstrategy/v1alpha1/zz_generated.register.go rename to pkg/apis/policy/v1alpha1/zz_generated.register.go index 55638541c..694d71998 100644 --- a/pkg/apis/propagationstrategy/v1alpha1/zz_generated.register.go +++ b/pkg/apis/policy/v1alpha1/zz_generated.register.go @@ -9,7 +9,7 @@ import ( ) // GroupName specifies the group name used to register the objects. -const GroupName = "propagationstrategy.karmada.io" +const GroupName = "policy.karmada.io" // GroupVersion specifies the group and the version used to register the objects. var GroupVersion = v1.GroupVersion{Group: GroupName, Version: "v1alpha1"} diff --git a/pkg/controllers/binding/binding_controller.go b/pkg/controllers/binding/binding_controller.go index ff348a825..1e5416fa8 100644 --- a/pkg/controllers/binding/binding_controller.go +++ b/pkg/controllers/binding/binding_controller.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" "github.com/karmada-io/karmada/pkg/util" "github.com/karmada-io/karmada/pkg/util/names" "github.com/karmada-io/karmada/pkg/util/overridemanager" diff --git a/pkg/controllers/execution/execution_controller.go b/pkg/controllers/execution/execution_controller.go index e30430076..f2478d842 100644 --- a/pkg/controllers/execution/execution_controller.go +++ b/pkg/controllers/execution/execution_controller.go @@ -17,7 +17,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" - propagationstrategy "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + propagationstrategy "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" "github.com/karmada-io/karmada/pkg/util" "github.com/karmada-io/karmada/pkg/util/names" "github.com/karmada-io/karmada/pkg/util/objectwatcher" diff --git a/pkg/controllers/policy/policy_controller.go b/pkg/controllers/policy/policy_controller.go index fc9191ee2..b6da64c5c 100644 --- a/pkg/controllers/policy/policy_controller.go +++ b/pkg/controllers/policy/policy_controller.go @@ -17,7 +17,7 @@ import ( "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" "github.com/karmada-io/karmada/pkg/util" "github.com/karmada-io/karmada/pkg/util/names" "github.com/karmada-io/karmada/pkg/util/restmapper" diff --git a/pkg/controllers/status/workstatus_controller.go b/pkg/controllers/status/workstatus_controller.go index 19d0f6505..830342689 100644 --- a/pkg/controllers/status/workstatus_controller.go +++ b/pkg/controllers/status/workstatus_controller.go @@ -20,7 +20,7 @@ import ( controllerruntime "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" "github.com/karmada-io/karmada/pkg/util" "github.com/karmada-io/karmada/pkg/util/informermanager" "github.com/karmada-io/karmada/pkg/util/names" diff --git a/pkg/karmadactl/join.go b/pkg/karmadactl/join.go index 154d39097..117fba804 100644 --- a/pkg/karmadactl/join.go +++ b/pkg/karmadactl/join.go @@ -18,7 +18,7 @@ import ( "k8s.io/klog/v2" clusterapi "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" - "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" karmadaclientset "github.com/karmada-io/karmada/pkg/generated/clientset/versioned" "github.com/karmada-io/karmada/pkg/karmadactl/options" "github.com/karmada-io/karmada/pkg/util" diff --git a/pkg/scheduler/core/generic_shceduler.go b/pkg/scheduler/core/generic_shceduler.go index 0265c538e..839071a64 100644 --- a/pkg/scheduler/core/generic_shceduler.go +++ b/pkg/scheduler/core/generic_shceduler.go @@ -7,7 +7,7 @@ import ( "k8s.io/klog/v2" clusterapi "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" - "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" lister "github.com/karmada-io/karmada/pkg/generated/listers/propagationstrategy/v1alpha1" "github.com/karmada-io/karmada/pkg/scheduler/cache" "github.com/karmada-io/karmada/pkg/scheduler/framework" diff --git a/pkg/scheduler/framework/interface.go b/pkg/scheduler/framework/interface.go index 71ebafbfc..fd6da2194 100644 --- a/pkg/scheduler/framework/interface.go +++ b/pkg/scheduler/framework/interface.go @@ -6,7 +6,7 @@ import ( "strings" cluster "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" - "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" ) // Framework manages the set of plugins in use by the scheduling framework. diff --git a/pkg/scheduler/framework/plugins/clusteraffinity/cluster_affinity.go b/pkg/scheduler/framework/plugins/clusteraffinity/cluster_affinity.go index 6305c9bd5..9779c5b1a 100644 --- a/pkg/scheduler/framework/plugins/clusteraffinity/cluster_affinity.go +++ b/pkg/scheduler/framework/plugins/clusteraffinity/cluster_affinity.go @@ -4,7 +4,7 @@ import ( "context" cluster "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" - "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" "github.com/karmada-io/karmada/pkg/scheduler/framework" ) diff --git a/pkg/scheduler/framework/runtime/framework.go b/pkg/scheduler/framework/runtime/framework.go index c3fc930e7..a97a4b267 100644 --- a/pkg/scheduler/framework/runtime/framework.go +++ b/pkg/scheduler/framework/runtime/framework.go @@ -8,7 +8,7 @@ import ( "k8s.io/klog/v2" cluster "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" - "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" "github.com/karmada-io/karmada/pkg/scheduler/framework" plugins2 "github.com/karmada-io/karmada/pkg/scheduler/framework/plugins" ) diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 0b3973531..9184961ef 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -16,7 +16,7 @@ import ( "k8s.io/klog/v2" memclusterapi "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" - "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" karmadaclientset "github.com/karmada-io/karmada/pkg/generated/clientset/versioned" informerfactory "github.com/karmada-io/karmada/pkg/generated/informers/externalversions" lister "github.com/karmada-io/karmada/pkg/generated/listers/propagationstrategy/v1alpha1" diff --git a/pkg/util/gclient/gclient.go b/pkg/util/gclient/gclient.go index 90e4818ce..b4c14d4c6 100644 --- a/pkg/util/gclient/gclient.go +++ b/pkg/util/gclient/gclient.go @@ -7,7 +7,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" - propagationv1alpha1 "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + propagationv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" ) // aggregatedScheme aggregates Kubernetes and extended schemes. diff --git a/pkg/util/overridemanager/overridemanager.go b/pkg/util/overridemanager/overridemanager.go index cc3f88b6c..9c36d092c 100644 --- a/pkg/util/overridemanager/overridemanager.go +++ b/pkg/util/overridemanager/overridemanager.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" - propagationstrategy "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + propagationstrategy "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" "github.com/karmada-io/karmada/pkg/util" ) diff --git a/pkg/util/selector.go b/pkg/util/selector.go index 52082f2df..d670bdebc 100644 --- a/pkg/util/selector.go +++ b/pkg/util/selector.go @@ -6,7 +6,7 @@ import ( "k8s.io/apimachinery/pkg/labels" clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" - "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" ) // ResourceMatches tells if the specific resource matches the selector. diff --git a/pkg/webhook/overridepolicy/mutating.go b/pkg/webhook/overridepolicy/mutating.go index f03375a45..fa374c554 100644 --- a/pkg/webhook/overridepolicy/mutating.go +++ b/pkg/webhook/overridepolicy/mutating.go @@ -8,7 +8,7 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" ) // MutatingAdmission mutates API request if necessary. diff --git a/samples/nginx/propagationpolicy.yaml b/samples/nginx/propagationpolicy.yaml index 8fb345acd..074f1195c 100644 --- a/samples/nginx/propagationpolicy.yaml +++ b/samples/nginx/propagationpolicy.yaml @@ -1,4 +1,4 @@ -apiVersion: propagationstrategy.karmada.io/v1alpha1 +apiVersion: policy.karmada.io/v1alpha1 kind: PropagationPolicy metadata: name: nginx-propagation diff --git a/test/helper/propagationpolicy.go b/test/helper/propagationpolicy.go index 1bd54a301..d71edf6d7 100644 --- a/test/helper/propagationpolicy.go +++ b/test/helper/propagationpolicy.go @@ -4,7 +4,7 @@ import ( appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - propagationapi "github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1" + propagationapi "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1" ) // NewPolicyWithSingleDeployment will build a PropagationPolicy object.