From e7043edbd8fc359da02771ba7ea1cf3a5350370b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 25 Aug 2020 17:48:25 +0200 Subject: [PATCH] ceph: reconcile if cm is config override MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- pkg/operator/ceph/controller/predicate.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/operator/ceph/controller/predicate.go b/pkg/operator/ceph/controller/predicate.go index fa13086a9..819597f5b 100644 --- a/pkg/operator/ceph/controller/predicate.go +++ b/pkg/operator/ceph/controller/predicate.go @@ -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 }