fix(execution promoter): Only enable execution promoter if enabled (#…

…3842) This way, if an orca cluster is not running the queue we don't enable the promoter
spinnaker · Aug 5, 2020 · 69b33e1 · 69b33e1
1 parent 2c78d69
commit 69b33e1
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/orca-qos/src/main/kotlin/com/netflix/spinnaker/orca/qos/ExecutionPromoter.kt b/orca-qos/src/main/kotlin/com/netflix/spinnaker/orca/qos/ExecutionPromoter.kt
@@ -27,6 +27,7 @@ import net.logstash.logback.argument.StructuredArguments.value
 import org.slf4j.LoggerFactory
 import org.slf4j.MDC
 import org.springframework.beans.factory.BeanInitializationException
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.context.ApplicationListener
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
@@ -37,6 +38,7 @@ import org.springframework.stereotype.Component
 interface ExecutionPromoter
 
 @Component
+@ConditionalOnProperty("pollers.qos.enabled")
 class DefaultExecutionPromoter(
   private val executionLauncher: ExecutionLauncher,
   private val executionRepository: ExecutionRepository,