compare whole resrouces file instead of spec section

Signed-off-by: YuChen <[email protected]>

Author: YuChen

controllers/operandrequest/reconcile_operand.go

@@ -1062,42 +1062,25 @@ func (r *Reconciler) updateK8sResource(ctx context.Context, existingK8sRes unstr
 				klog.Errorf("failed to unmarshal k8s Resource Config: %v", k8sResConfigUnmarshalErr)
 			}
 
-			for key := range existingK8sRes.Object {
-				if _, ok := k8sResConfigDecoded[key]; !ok {
-					continue
-				}
-				if reflect.DeepEqual(existingK8sRes.Object[key], k8sResConfigDecoded[key]) {
-					continue
-				}
-
-				// Convert k8s resource spec in OperandConfig to string
-				k8sResConfigRaw, err := json.Marshal(k8sResConfigDecoded[key])
-				if err != nil {
-					klog.Error(err)
-					return false, err
-				}
-
-				// Convert existing k8s resource spec to string
-				existingK8sResRaw, err := json.Marshal(existingK8sRes.Object[key])
-				if err != nil {
-					klog.Error(err)
-					return false, err
-				}
+			// Convert existing k8s resource spec to string
+			existingK8sResRaw, err := json.Marshal(existingK8sRes.Object)
+			if err != nil {
+				klog.Error(err)
+				return false, err
+			}
 
-				// Merge spec from existing CR and OperandConfig spec
-				updatedExistingK8sRes := util.MergeCR(existingK8sResRaw, k8sResConfigRaw)
+			// Merge spec from existing CR and OperandConfig spec
+			updatedExistingK8sRes := util.MergeCR(existingK8sResRaw, k8sResConfig.Raw)
 
-				r.EnsureAnnotation(existingK8sRes, newAnnotations)
-				r.EnsureLabel(existingK8sRes, newLabels)
+			r.EnsureAnnotation(existingK8sRes, newAnnotations)
+			r.EnsureLabel(existingK8sRes, newLabels)
 
-				if reflect.DeepEqual(existingK8sRes.Object[key], updatedExistingK8sRes) {
-					continue
-				}
-
-				klog.Infof("updating k8s resource with apiversion: %s, kind: %s, %s/%s", apiversion, kind, namespace, name)
-
-				existingK8sRes.Object[key] = updatedExistingK8sRes
+			if reflect.DeepEqual(existingK8sRes.Object, updatedExistingK8sRes) {
+				return true, nil
 			}
+			klog.Infof("updating k8s resource with apiversion: %s, kind: %s, %s/%s", apiversion, kind, namespace, name)
+
+			existingK8sRes.Object = updatedExistingK8sRes
 
 			CRgeneration := existingK8sRes.GetGeneration()
 
@@ -1127,7 +1110,6 @@ func (r *Reconciler) updateK8sResource(ctx context.Context, existingK8sRes unstr
 			if UpdatedK8sRes.GetGeneration() != CRgeneration {
 				klog.Infof("Finish updating the k8s Resource: -- Kind: %s, NamespacedName: %s/%s", kind, namespace, name)
 			}
-
 		}
 		return true, nil
 	})

controllers/util/merge.go

@@ -80,17 +80,17 @@ func checkKeyBeforeMerging(key string, defaultMap interface{}, changedMap interf
 				changedMapRef := changedMap.([]interface{})
 				for i := range defaultMapRef {
 					if _, ok := defaultMapRef[i].(map[string]interface{}); ok {
-						for newKey := range defaultMapRef[i].(map[string]interface{}) {
-							// check if the changedMapRef[i] is nil
-							if changedMapRef[i] == nil {
-								changedMapRef[i] = map[string]interface{}{}
+						if len(changedMapRef) <= i {
+							finalMap[key] = append(finalMap[key].([]interface{}), defaultMapRef[i])
+						} else {
+
+							for newKey := range defaultMapRef[i].(map[string]interface{}) {
+								checkKeyBeforeMerging(newKey, defaultMapRef[i].(map[string]interface{})[newKey], changedMapRef[i].(map[string]interface{})[newKey], finalMap[key].([]interface{})[i].(map[string]interface{}))
 							}
-							checkKeyBeforeMerging(newKey, defaultMapRef[i].(map[string]interface{})[newKey], changedMapRef[i].(map[string]interface{})[newKey], finalMap[key].([]interface{})[i].(map[string]interface{}))
 						}
 					}
 				}
 			}
-
 		default:
 			//Check if the value was set, otherwise set it
 			if changedMap == nil {