Address PR review feedback for CER phase annotations

- Rename mergeLabelMaps to mergeStringMaps since it handles both labels and annotations
- Only set bundle-version/package-name annotations when values are non-empty
- Update unit test to use realistic revisionAnnotations values

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: pedjak

internal/operator-controller/applier/boxcutter.go

@@ -68,17 +68,23 @@ func (r *SimpleRevisionGenerator) GenerateRevisionFromHelmRelease(
 		if err := yaml.Unmarshal([]byte(doc), &obj); err != nil {
 			return nil, err
 		}
-		obj.SetLabels(mergeLabelMaps(obj.GetLabels(), objectLabels))
+		obj.SetLabels(mergeStringMaps(obj.GetLabels(), objectLabels))
 
 		// Memory optimization: strip large annotations
 		// Note: ApplyStripTransform never returns an error in practice
 		_ = cache.ApplyStripAnnotationsTransform(&obj)
 		sanitizedUnstructured(ctx, &obj)
 
-		obj.SetAnnotations(mergeLabelMaps(obj.GetAnnotations(), map[string]string{
-			labels.BundleVersionKey: helmRelease.Labels[labels.BundleVersionKey],
-			labels.PackageNameKey:   helmRelease.Labels[labels.PackageNameKey],
-		}))
+		annotationUpdates := map[string]string{}
+		if v := helmRelease.Labels[labels.BundleVersionKey]; v != "" {
+			annotationUpdates[labels.BundleVersionKey] = v
+		}
+		if v := helmRelease.Labels[labels.PackageNameKey]; v != "" {
+			annotationUpdates[labels.PackageNameKey] = v
+		}
+		if len(annotationUpdates) > 0 {
+			obj.SetAnnotations(mergeStringMaps(obj.GetAnnotations(), annotationUpdates))
+		}
 
 		objs = append(objs, *ocv1ac.ClusterExtensionRevisionObject().
 			WithObject(obj))
@@ -131,7 +137,7 @@ func (r *SimpleRevisionGenerator) GenerateRevision(
 	// objectLabels
 	objs := make([]ocv1ac.ClusterExtensionRevisionObjectApplyConfiguration, 0, len(plain))
 	for _, obj := range plain {
-		obj.SetLabels(mergeLabelMaps(obj.GetLabels(), objectLabels))
+		obj.SetLabels(mergeStringMaps(obj.GetLabels(), objectLabels))
 
 		gvk, err := apiutil.GVKForObject(obj, r.Scheme)
 		if err != nil {
@@ -151,10 +157,16 @@ func (r *SimpleRevisionGenerator) GenerateRevision(
 		}
 		sanitizedUnstructured(ctx, &unstr)
 
-		unstr.SetAnnotations(mergeLabelMaps(unstr.GetAnnotations(), map[string]string{
-			labels.BundleVersionKey: revisionAnnotations[labels.BundleVersionKey],
-			labels.PackageNameKey:   revisionAnnotations[labels.PackageNameKey],
-		}))
+		annotationUpdates := map[string]string{}
+		if v := revisionAnnotations[labels.BundleVersionKey]; v != "" {
+			annotationUpdates[labels.BundleVersionKey] = v
+		}
+		if v := revisionAnnotations[labels.PackageNameKey]; v != "" {
+			annotationUpdates[labels.PackageNameKey] = v
+		}
+		if len(annotationUpdates) > 0 {
+			unstr.SetAnnotations(mergeStringMaps(unstr.GetAnnotations(), annotationUpdates))
+		}
 
 		objs = append(objs, *ocv1ac.ClusterExtensionRevisionObject().
 			WithObject(unstr))
@@ -681,9 +693,9 @@ func revisionManagementPerms(rev *ocv1ac.ClusterExtensionRevisionApplyConfigurat
 	}
 }
 
-func mergeLabelMaps(m1, m2 map[string]string) map[string]string {
-	mergedLabels := make(map[string]string, len(m1)+len(m2))
-	maps.Copy(mergedLabels, m1)
-	maps.Copy(mergedLabels, m2)
-	return mergedLabels
+func mergeStringMaps(m1, m2 map[string]string) map[string]string {
+	merged := make(map[string]string, len(m1)+len(m2))
+	maps.Copy(merged, m1)
+	maps.Copy(merged, m2)
+	return merged
 }

internal/operator-controller/applier/boxcutter_test.go

@@ -207,7 +207,10 @@ func Test_SimpleRevisionGenerator_GenerateRevision(t *testing.T) {
 		},
 	}
 
-	rev, err := b.GenerateRevision(t.Context(), dummyBundle, ext, map[string]string{}, map[string]string{})
+	rev, err := b.GenerateRevision(t.Context(), dummyBundle, ext, map[string]string{}, map[string]string{
+		labels.BundleVersionKey: "1.0.0",
+		labels.PackageNameKey:   "test-package",
+	})
 	require.NoError(t, err)
 
 	t.Log("by checking the olm.operatorframework.io/owner-name and owner-kind labels are set")
@@ -232,8 +235,8 @@ func Test_SimpleRevisionGenerator_GenerateRevision(t *testing.T) {
 							"metadata": map[string]interface{}{
 								"name": "test-service",
 								"annotations": map[string]interface{}{
-									"olm.operatorframework.io/bundle-version": "",
-									"olm.operatorframework.io/package-name":   "",
+									"olm.operatorframework.io/bundle-version": "1.0.0",
+									"olm.operatorframework.io/package-name":   "test-package",
 								},
 							},
 							"spec": map[string]interface{}{},
@@ -256,8 +259,8 @@ func Test_SimpleRevisionGenerator_GenerateRevision(t *testing.T) {
 								},
 								"annotations": map[string]interface{}{
 									"my-annotation": "my-annotation-value",
-									"olm.operatorframework.io/bundle-version": "",
-									"olm.operatorframework.io/package-name":   "",
+									"olm.operatorframework.io/bundle-version": "1.0.0",
+									"olm.operatorframework.io/package-name":   "test-package",
 								},
 							},
 							"spec": map[string]interface{}{