touch up manually

Signed-off-by: Ryan Zhang <[email protected]>

Author: ryanzhang-oss

apis/placement/v1beta1/clusterresourceplacement_types.go

@@ -105,6 +105,14 @@ type PlacementSpec struct {
 	RevisionHistoryLimit *int32 `json:"revisionHistoryLimit,omitempty"`
 }
 
+// Tolerations returns tolerations for PlacementSpec to handle nil policy case.
+func (p *PlacementSpec) Tolerations() []Toleration {
+	if p.Policy != nil {
+		return p.Policy.Tolerations
+	}
+	return nil
+}
+
 // TODO: rename this to ResourceSelectorTerm
 // ClusterResourceSelector is used to select cluster scoped resources as the target resources to be placed.
 // All the fields are `ANDed`. In other words, a resource must match all the fields to be selected.
@@ -1275,14 +1283,6 @@ type ClusterResourcePlacementList struct {
 	Items           []ClusterResourcePlacement `json:"items"`
 }
 
-// Tolerations returns tolerations for ClusterResourcePlacement.
-func (m *ClusterResourcePlacement) Tolerations() []Toleration {
-	if m.Spec.Policy != nil {
-		return m.Spec.Policy.Tolerations
-	}
-	return nil
-}
-
 // SetConditions sets the conditions of the ClusterResourcePlacement.
 func (m *ClusterResourcePlacement) SetConditions(conditions ...metav1.Condition) {
 	for _, c := range conditions {

apis/placement/v1beta1/policysnapshot_types.go

@@ -106,6 +106,14 @@ type SchedulingPolicySnapshotSpec struct {
 	PolicyHash []byte `json:"policyHash"`
 }
 
+// Tolerations returns tolerations for SchedulingPolicySnapshotSpec to handle nil policy case.
+func (s *SchedulingPolicySnapshotSpec) Tolerations() []Toleration {
+	if s.Policy != nil {
+		return s.Policy.Tolerations
+	}
+	return nil
+}
+
 // SchedulingPolicySnapshotStatus defines the observed state of SchedulingPolicySnapshot.
 type SchedulingPolicySnapshotStatus struct {
 	// +patchMergeKey=type
@@ -191,14 +199,6 @@ type ClusterSchedulingPolicySnapshotList struct {
 	Items           []ClusterSchedulingPolicySnapshot `json:"items"`
 }
 
-// Tolerations returns tolerations for ClusterSchedulingPolicySnapshot.
-func (m *ClusterSchedulingPolicySnapshot) Tolerations() []Toleration {
-	if m.Spec.Policy != nil {
-		return m.Spec.Policy.Tolerations
-	}
-	return nil
-}
-
 // SetConditions sets the given conditions on the ClusterSchedulingPolicySnapshot.
 func (m *ClusterSchedulingPolicySnapshot) SetConditions(conditions ...metav1.Condition) {
 	for _, c := range conditions {
@@ -284,14 +284,6 @@ type SchedulingPolicySnapshotList struct {
 	Items           []SchedulingPolicySnapshot `json:"items"`
 }
 
-// Tolerations returns tolerations for ClusterSchedulingPolicySnapshot.
-func (m *SchedulingPolicySnapshot) Tolerations() []Toleration {
-	if m.Spec.Policy != nil {
-		return m.Spec.Policy.Tolerations
-	}
-	return nil
-}
-
 // SetConditions sets the given conditions on the ClusterSchedulingPolicySnapshot.
 func (m *SchedulingPolicySnapshot) SetConditions(conditions ...metav1.Condition) {
 	for _, c := range conditions {

pkg/scheduler/framework/plugins/tainttoleration/filtering.go

@@ -23,7 +23,7 @@ func (p *Plugin) Filter(
 	policy placementv1beta1.PolicySnapshotObj,
 	cluster *clusterv1beta1.MemberCluster,
 ) (status *framework.Status) {
-	taint, isUntolerated := findUntoleratedTaint(cluster.Spec.Taints, policy.GetPolicySnapshotSpec().Policy.Tolerations)
+	taint, isUntolerated := findUntoleratedTaint(cluster.Spec.Taints, policy.GetPolicySnapshotSpec().Tolerations())
 	if !isUntolerated {
 		return nil
 	}

pkg/scheduler/scheduler.go

@@ -360,12 +360,12 @@ func (s *Scheduler) lookupLatestPolicySnapshot(ctx context.Context, placement fl
 	case len(policySnapshots) == 0:
 		// There is no latest policy snapshot associated with the placement; it could happen when
 		// * the placement is newly created; or
-		// * the sequence of policy snapshots is in an inconsistent state.
+		// * the new policy snapshots is in the middle of being replaced.
 		//
 		// Either way, it is out of the scheduler's scope to handle such a case; the scheduler will
 		// be triggered again if the situation is corrected.
-		err := controller.NewExpectedBehaviorError(fmt.Errorf("no latest policy snapshot associated with placement"))
-		klog.ErrorS(err, "Failed to find the latest policy snapshot", "placement", placementRef)
+		err := fmt.Errorf("no latest policy snapshot associated with placement")
+		klog.ErrorS(err, "Failed to find the latest policy snapshot, will retry", "placement", placementRef)
 		return nil, err
 	case len(policySnapshots) > 1:
 		// There are multiple active policy snapshots associated with the placement; normally this

pkg/webhook/clusterresourceplacement/v1beta1_clusterresourceplacement_validating_webhook.go

@@ -66,7 +66,7 @@ func (v *clusterResourcePlacementValidator) Handle(_ context.Context, req admiss
 				return admission.Denied("placement type is immutable")
 			}
 			// handle update case where existing tolerations were updated/deleted
-			if validator.IsTolerationsUpdatedOrDeleted(oldCRP.Tolerations(), crp.Tolerations()) {
+			if validator.IsTolerationsUpdatedOrDeleted(oldCRP.Spec.Tolerations(), crp.Spec.Tolerations()) {
 				return admission.Denied("tolerations have been updated/deleted, only additions to tolerations are allowed")
 			}
 		}

test/scheduler/suite_test.go

@@ -532,8 +532,9 @@ func beforeSuiteForProcess1() []byte {
 	klog.InitFlags(nil)
 	Expect(flag.Set("v", "5")).To(Succeed(), "Failed to set verbosity flag")
 	flag.Parse()
-	klog.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true), zap.Level(zapcore.Level(-5))))
-
+	logger := zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true), zap.Level(zapcore.Level(-5)))
+	klog.SetLogger(logger)
+	ctrl.SetLogger(logger)
 	By("bootstrapping the test environment")
 	// Start the hub cluster.
 	hubTestEnv = &envtest.Environment{