address comments

Azure · Oct 9, 2023 · da1001c · da1001c
1 parent c95eb4e
commit da1001c
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/apis/cluster/v1beta1/zz_generated.deepcopy.go b/apis/cluster/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/placement/v1beta1/commons.go b/apis/placement/v1beta1/commons.go
@@ -79,5 +79,5 @@ const (
 
 	// PreviousBindingStateAnnotation is the annotation that records the previous state of a binding.
 	// This is used to remember if an "unscheduled" binding was moved from a "bound" state or a "scheduled" state.
-	PreviousBindingStateAnnotation = fleetPrefix + "PreviousBindingState"
+	PreviousBindingStateAnnotation = fleetPrefix + "previous-binding-state"
 )
diff --git a/apis/placement/v1beta1/zz_generated.deepcopy.go b/apis/placement/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controllers/workgenerator/controller.go b/pkg/controllers/workgenerator/controller.go
@@ -279,7 +279,7 @@ func (r *Reconciler) syncAllWork(ctx context.Context, resourceBinding *fleetv1be
 			// generate a work object for the manifests if there are still any non enveloped resources
 			newWork = append(newWork, generateSnapshotWorkObj(workNamePrefix, resourceBinding, snapshot, simpleManifests))
 		} else {
-			klog.V(2).InfoS("Skip generating work for the snapshot since there is no none-enveloped resource in the snapshot", "snapshot", klog.KObj(snapshot))
+			klog.V(2).InfoS("the snapshot contains enveloped resource only", "snapshot", klog.KObj(snapshot))
 		}
 		// issue all the create/update requests for the corresponding works for each snapshot in parallel
 		for i := range newWork {
@@ -393,7 +393,8 @@ func (r *Reconciler) getConfigMapEnvelopWorkObj(ctx context.Context, workNamePre
 			"resourceBinding", klog.KObj(resourceBinding), "configMapWrapper", klog.KObj(envelopeObj))
 		return nil, controller.NewUserError(err)
 	}
-	klog.V(2).InfoS("Successfully extract the enveloped resources from the configMap", "numOfResources", len(manifest), "configMapWrapper", klog.KObj(envelopeObj))
+	klog.V(2).InfoS("Successfully extract the enveloped resources from the configMap", "numOfResources", len(manifest),
+		"snapshot", klog.KObj(resourceSnapshot), "resourceBinding", klog.KObj(resourceBinding), "configMapWrapper", klog.KObj(envelopeObj))
 	// Try to see if we already have a work represent the same enveloped object for this CRP in the same cluster
 	envelopWorkLabelMatcher := client.MatchingLabels{
 		fleetv1beta1.ParentBindingLabel:     resourceBinding.Name,

diff --git a/...orkgenerator/manifests/resourceQuota.yaml → ...orkgenerator/manifests/resourcequota.yaml b/...orkgenerator/manifests/resourceQuota.yaml → ...orkgenerator/manifests/resourcequota.yaml
diff --git a/pkg/controllers/workgenerator/manifests/test-envelop-configmap.yaml b/pkg/controllers/workgenerator/manifests/test-envelop-configmap.yaml
@@ -48,4 +48,4 @@ data:
         - UPDATE
         resources:
         - pods
-      sideEffects: None
+      sideEffects: None
diff --git a/pkg/controllers/workgenerator/manifests/test-envelop-configmap2.yaml b/pkg/controllers/workgenerator/manifests/test-envelop-configmap2.yaml
@@ -36,4 +36,4 @@ data:
         - UPDATE
         resources:
         - pods
-      sideEffects: None
+      sideEffects: None
diff --git a/pkg/controllers/workgenerator/suite_test.go b/pkg/controllers/workgenerator/suite_test.go
@@ -164,7 +164,7 @@ func readTestManifests() {
 	Expect(err).Should(Succeed())
 
 	By("Read ResourceQuota")
-	rawByte, err = os.ReadFile("manifests/resourceQuota.yaml")
+	rawByte, err = os.ReadFile("manifests/resourcequota.yaml")
 	Expect(err).Should(Succeed())
 	testEnvelopeResourceQuota, err = yaml.ToJSON(rawByte)
 	Expect(err).Should(Succeed())