Update controllers/configurationpolicy_controller.go

Co-authored-by: Matt Prahl <mprahl@users.noreply.github.com>
open-cluster-management-io · Apr 11, 2024 · ddaec9b · ddaec9b
1 parent 573cb1b
commit ddaec9b
Showing 1 changed file with 2 additions and 19 deletions.
diff --git a/controllers/configurationpolicy_controller.go b/controllers/configurationpolicy_controller.go
@@ -2810,25 +2810,8 @@ func handleKeys(
  continue
  }
 
- // check key for mismatch
- errorMsg, keyUpdateNeeded, mergedObj, skipped := handleSingleKey(
- key, desiredObj, existingObjectCopy, compType, zeroValueEqualsNil,
- )
- if errorMsg != "" {
- log.Info(errorMsg)
-
- return true, errorMsg, true, statusMismatch
- }
-
- // If the mergedObj is nil, we'll use the value to erase it from the existing object.
- if skipped {
- continue
- }
-
- if keyUpdateNeeded {
- existingObj.Object[key] = mergedObj
- updateNeeded = true
- }
+ delete(existingObj.Object, key)
+ updateNeeded = true
  }
  }