Skip to content

Commit

Permalink
Merge pull request #13606 from rook/mergify/bp/release-1.12/pr-13597
Browse files Browse the repository at this point in the history
exporter: Skip reconcile on exporter deletion (backport #13597)
  • Loading branch information
mergify[bot] committed Jan 22, 2024
2 parents 8d5e5b4 + 4a31cd3 commit d539137
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions pkg/operator/ceph/controller/predicate.go
Original file line number Diff line number Diff line change
Expand Up @@ -521,8 +521,8 @@ func WatchPredicateForNonCRDObject(owner runtime.Object, scheme *runtime.Scheme)
return false
}

// If the resource is a canary deployment we don't reconcile because it's ephemeral
if isCanary(e.Object) || isCrashCollector(e.Object) {
// If the resource is a canary, crash collector, or exporter we don't reconcile because it's ephemeral
if isCanary(e.Object) || isCrashCollector(e.Object) || isExporter(e.Object) {
return false
}

Expand Down Expand Up @@ -693,6 +693,14 @@ func isCanary(obj runtime.Object) bool {
}

func isCrashCollector(obj runtime.Object) bool {
return isDeployment(obj, "rook-ceph-crashcollector")
}

func isExporter(obj runtime.Object) bool {
return isDeployment(obj, "rook-ceph-exporter")
}

func isDeployment(obj runtime.Object, appName string) bool {
// If not a deployment, let's not reconcile
d, ok := obj.(*appsv1.Deployment)
if !ok {
Expand All @@ -703,8 +711,8 @@ func isCrashCollector(obj runtime.Object) bool {
labels := d.GetLabels()

labelVal, labelKeyExist := labels["app"]
if labelKeyExist && labelVal == "rook-ceph-crashcollector" {
logger.Debugf("do not reconcile %q on crash collectors", d.Name)
if labelKeyExist && labelVal == appName {
logger.Debugf("do not reconcile %q on %s", d.Name, appName)
return true
}

Expand Down

0 comments on commit d539137

Please sign in to comment.