This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 6e994c0f27b1d7484ddc2995705b04ca80886bb5 Author: Nicola Ferraro <[email protected]> AuthorDate: Tue Jan 28 01:39:09 2020 +0100 1199: fix cronjob conditions and message --- pkg/trait/cron.go | 27 +++++++++++++++++++++------ pkg/trait/knative_service.go | 4 ++-- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/pkg/trait/cron.go b/pkg/trait/cron.go index 815aa66..4445438 100644 --- a/pkg/trait/cron.go +++ b/pkg/trait/cron.go @@ -180,21 +180,36 @@ func (t *cronTrait) Configure(e *Environment) (bool, error) { // Fallback strategy can be implemented in any other controller if t.Fallback != nil && *t.Fallback { + if e.InPhase(v1.IntegrationKitPhaseReady, v1.IntegrationPhaseDeploying) { + e.Integration.Status.SetCondition( + v1.IntegrationConditionCronJobAvailable, + corev1.ConditionFalse, + v1.IntegrationConditionCronJobNotAvailableReason, + "fallback strategy selected", + ) + } return true, nil } // CronJob strategy requires common schedule strategy, err := e.DetermineControllerStrategy(t.Ctx, t.Client) if err != nil { - return false, err - } - if strategy != ControllerStrategyCronJob { - e.Integration.Status.SetCondition( + e.Integration.Status.SetErrorCondition( v1.IntegrationConditionCronJobAvailable, - corev1.ConditionFalse, v1.IntegrationConditionCronJobNotAvailableReason, - "controller strategy: "+string(strategy), + err, ) + return false, err + } + if strategy != ControllerStrategyCronJob { + if e.InPhase(v1.IntegrationKitPhaseReady, v1.IntegrationPhaseDeploying) { + e.Integration.Status.SetCondition( + v1.IntegrationConditionCronJobAvailable, + corev1.ConditionFalse, + v1.IntegrationConditionCronJobNotAvailableReason, + fmt.Sprintf("different controller strategy used (%s)", string(strategy)), + ) + } return false, nil } diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go index 37f18f2..9c9e671 100644 --- a/pkg/trait/knative_service.go +++ b/pkg/trait/knative_service.go @@ -115,7 +115,7 @@ func (t *knativeServiceTrait) Configure(e *Environment) (bool, error) { v1.IntegrationConditionKnativeServiceAvailable, corev1.ConditionFalse, v1.IntegrationConditionKnativeServiceNotAvailableReason, - fmt.Sprintf("different controller strategy chosen (%s)", string(ControllerStrategyDeployment)), + fmt.Sprintf("different controller strategy used (%s)", string(ControllerStrategyDeployment)), ) // A controller is already present for the integration @@ -137,7 +137,7 @@ func (t *knativeServiceTrait) Configure(e *Environment) (bool, error) { v1.IntegrationConditionKnativeServiceAvailable, corev1.ConditionFalse, v1.IntegrationConditionKnativeServiceNotAvailableReason, - "controller strategy: "+string(strategy), + fmt.Sprintf("different controller strategy used (%s)", string(strategy)), ) return false, nil
