update packageName annotation in tracking configmap to be more unique (#1181)

* update packageName annotation in tracking configmap to be more unique

Signed-off-by: Ben Luzarraga <[email protected]>

* additional annotation location

Signed-off-by: Ben Luzarraga <[email protected]>

* backwards compatibility check to update existing configmaps

Signed-off-by: Ben Luzarraga <[email protected]>

---------

Signed-off-by: Ben Luzarraga <[email protected]>

Author: bluzarraga

controllers/operandrequestnoolm/reconcile_operator.go

@@ -211,7 +211,7 @@ func (r *Reconciler) reconcileOpReqCM(ctx context.Context, requestInstance *oper
 		cm.Annotations[registryKey.Namespace+"."+registryKey.Name+"/config"] = "true"
 		cm.Annotations[requestInstance.Namespace+"."+requestInstance.Name+"."+operand.Name+"/request"] = opt.Channel
 		cm.Annotations[requestInstance.Namespace+"."+requestInstance.Name+"."+operand.Name+"/operatorNamespace"] = namespace
-		cm.Annotations["packageName"] = opt.PackageName
+		cm.Annotations["operator.ibm.com.common-service/packageName"] = opt.PackageName
 		if opt.ConfigName != "" {
 			cm.Annotations[requestInstance.Namespace+"."+requestInstance.Name+"."+operand.Name+"/config"] = opt.ConfigName
 		} else {
@@ -549,7 +549,7 @@ func (r *Reconciler) generateClusterObjects(o *operatorv1alpha1.Operator, regist
 		registryKey.Namespace + "." + registryKey.Name + "/config":                         "true",
 		requestKey.Namespace + "." + requestKey.Name + "." + o.Name + "/request":           o.Channel,
 		requestKey.Namespace + "." + requestKey.Name + "." + o.Name + "/operatorNamespace": namespace,
-		"packageName": o.PackageName,
+		"operator.ibm.com.common-service/packageName":                                      o.PackageName,
 	}
 	if o.ConfigName != "" {
 		annotations[requestKey.Namespace+"."+requestKey.Name+"."+o.Name+"/config"] = o.ConfigName

controllers/operator/manager.go

@@ -485,8 +485,12 @@ func (m *ODLMOperator) GetOpReqCM(ctx context.Context, operatorName, operatorNs,
 
 		for _, cm := range cmList.Items {
 			if cm.Annotations != nil {
-				if pkg, exists := cm.Annotations["packageName"]; exists && pkg == operatorName {
+				if pkg, exists := cm.Annotations["operator.ibm.com.common-service/packageName"]; exists && pkg == operatorName {
 					cmCandidates = append(cmCandidates, cm)
+				} else if _, ok := cm.Labels[constant.OpreqLabel]; ok {
+					if pkg, old_anno_exists := cm.Annotations["packageName"]; old_anno_exists && pkg == operatorName {
+						cmCandidates = append(cmCandidates, cm)
+					}
 				}
 			}
 		}