Add explicit kind selection to deployer trait

docs/traits.adoc

@@ -76,6 +76,9 @@ The following is a list of common traits that can be configured by the end users
 ! deployer.container-image
 ! Generates a container image for the Integration that includes the sources and resources in the generated images instead of mounting them to the pod.
 
+! deployer.kind
+! Allows to explicitly select the desired deployment kind between `deployment` or `knative-service` when creating the resources for running the integration.
+
 !===
 
 | deployment

pkg/trait/deployer.go

@@ -19,7 +19,8 @@ package trait
 
 type deployerTrait struct {
 	BaseTrait      `property:",squash"`
-	ContainerImage bool `property:"container-image"`
+	ContainerImage bool   `property:"container-image"`
+	Kind           string `property:"kind"`
 }
 
 func newDeployerTrait() *deployerTrait {

pkg/trait/trait_types.go

@@ -193,6 +193,16 @@ func (e *Environment) DetermineControllerStrategy(ctx context.Context, c client.
 		return ControllerStrategyDeployment, nil
 	}
 
+	trait := e.GetTrait("deployer")
+	if trait != nil {
+		deployerTrait := trait.(*deployerTrait)
+		if deployerTrait.Kind == ControllerStrategyDeployment {
+			return ControllerStrategyDeployment, nil
+		} else if deployerTrait.Kind == ControllerStrategyKnativeService {
+			return ControllerStrategyKnativeService, nil
+		}
+	}
+
 	var sources []v1alpha1.SourceSpec
 	var err error
 	if sources, err = kubernetes.ResolveIntegrationSources(ctx, c, e.Integration, e.Resources); err != nil {

pkg/util/camel/camel_util.go

@@ -65,6 +65,7 @@ func FindBestSemVerMatch(constraint *semver.Constraints, catalogs []v1alpha1.Cam
 		v, err := semver.NewVersion(catalog.Spec.Version)
 		if err != nil {
 			log.Debugf("Invalid semver version %s, skip it", catalog.Spec.Version)
+			continue
 		}
 
 		versions = append(versions, v)