ceph: reconcile if cm is config override

Earlier, we were returning only when the object was not the config
override configmap, we want the opposite.
Also, this was blocking all subsequent conditions and add the correct
check to avoid cm to reconcile.

Signed-off-by: Sébastien Han <seb@redhat.com>
This commit is contained in:
Sébastien Han committed 2020-09-01 09:32:15 +02:00
1 parent b68f9a7a41
commit e7043edbd8
1 file changed
+10 -2
+10 -2
View File
@@ -384,7 +384,15 @@ func WatchPredicateForNonCRDObject(owner runtime.Object, scheme *runtime.Scheme)
// CONFIGMAP WHITELIST
// Only reconcile on rook-config-override CM changes
isCMTConfigOverride := isCMTConfigOverride(e.ObjectNew)
if !isCMTConfigOverride {
if isCMTConfigOverride {
logger.Debugf("do reconcile when the cm is %s", k8sutil.ConfigOverrideName)
return true
}
// If the resource is a ConfigMap we don't reconcile
_, ok := e.ObjectNew.(*corev1.ConfigMap)
if ok {
logger.Debugf("do not reconcile on configmap that is not %q", k8sutil.ConfigOverrideName)
return false
}
@@ -397,7 +405,7 @@ func WatchPredicateForNonCRDObject(owner runtime.Object, scheme *runtime.Scheme)
}
// If the resource is a deployment we don't reconcile
_, ok := e.ObjectNew.(*appsv1.Deployment)
_, ok = e.ObjectNew.(*appsv1.Deployment)
if ok {
return false
}