Merge pull request #240 from JackZxj/chore/remove-deprecated

chore(policy): remove deprecated parameters
kubewharf · Sep 25, 2023 · e0dd3cd · e0dd3cd
2 parents 6187ed8 + 2fc88b3
commit e0dd3cd
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 52 deletions.
diff --git a/config/crds/core.kubeadmiral.io_clusterpropagationpolicies.yaml b/config/crds/core.kubeadmiral.io_clusterpropagationpolicies.yaml
diff --git a/config/crds/core.kubeadmiral.io_propagationpolicies.yaml b/config/crds/core.kubeadmiral.io_propagationpolicies.yaml
diff --git a/config/crds/patches/generic_propagationpolicies.src.sh b/config/crds/patches/generic_propagationpolicies.src.sh
@@ -1,6 +1,5 @@
 # controller-gen does not respect {} as default value for a struct field
 # issue: https://github.com/kubernetes-sigs/controller-tools/issues/622
-yq eval -i '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.replicaRescheduling.default = {}' "$1"
 yq eval -i '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.reschedulePolicy.properties.replicaRescheduling.default = {}' "$1"
 
 # policies are always referenced from labels, the value of which has limited length

diff --git a/pkg/apis/core/v1alpha1/types_propagationpolicy.go b/pkg/apis/core/v1alpha1/types_propagationpolicy.go
@@ -66,10 +66,6 @@ type PropagationPolicySpec struct {
 
 	// SchedulingMode determines the mode used for scheduling.
 	SchedulingMode SchedulingMode `json:"schedulingMode"`
-	// StickyCluster determines if a federated object can be rescheduled.
-	// +optional
-	// Deprecated: Please use reschedulePolicy.disableRescheduling instead. This field will be removed in the next release.
-	StickyCluster bool `json:"stickyCluster"`
 
 	// ClusterSelector is a label query over clusters to consider for scheduling.
 	// An empty or nil ClusterSelector selects everything.
@@ -103,13 +99,6 @@ type PropagationPolicySpec struct {
 	// +optional
 	AutoMigration *AutoMigration `json:"autoMigration,omitempty"`
 
-	// Configures behaviors related to replica rescheduling.
-	// +optional
-	// Default set via a post-generation patch.
-	// See patch file for details.
-	// Deprecated: Please use reschedulePolicy.disableRescheduling instead. This field will be removed in the next release.
-	ReplicaRescheduling *ReplicaRescheduling `json:"replicaRescheduling,omitempty"`
-
 	// Configures behaviors related to rescheduling.
 	// +optional
 	// +kubebuilder:default:={rescheduleWhen:{policyContentChanged:true}}

diff --git a/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controllers/scheduler/schedulingunit.go b/pkg/controllers/scheduler/schedulingunit.go
@@ -241,20 +241,13 @@ func getAutoMigrationInfo(fedObject fedcorev1a1.GenericFederatedObject) (*framew
 }
 
 func getIsStickyClusterFromPolicy(policy fedcorev1a1.GenericPropagationPolicy) bool {
-	// Currently, either switch can take effect
-	if rp := policy.GetSpec().ReschedulePolicy; rp != nil && rp.DisableRescheduling {
-		return true
-	}
-	return policy.GetSpec().StickyCluster
+	rp := policy.GetSpec().ReschedulePolicy
+	return rp != nil && rp.DisableRescheduling
 }
 
 func getAvoidDisruptionFromPolicy(policy fedcorev1a1.GenericPropagationPolicy) bool {
-	// Currently, either switch can take effect
-	if rp := policy.GetSpec().ReschedulePolicy; rp != nil &&
-		rp.ReplicaRescheduling != nil && rp.ReplicaRescheduling.AvoidDisruption {
-		return true
-	}
-	return policy.GetSpec().ReplicaRescheduling != nil && policy.GetSpec().ReplicaRescheduling.AvoidDisruption
+	rp := policy.GetSpec().ReschedulePolicy
+	return rp != nil && rp.ReplicaRescheduling != nil && rp.ReplicaRescheduling.AvoidDisruption
 }
 
 func getIsStickyClusterFromObject(object fedcorev1a1.GenericFederatedObject) (bool, bool) {