This is an automated email from the ASF dual-hosted git repository.

astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 9eaf3eaa6df02176a3c7c084d9840c5ecec4b673
Author: Antonin Stefanutti <[email protected]>
AuthorDate: Wed Jun 3 10:59:34 2020 +0200

    chore: Remove unused parameters
---
 pkg/trait/cron.go            | 2 +-
 pkg/trait/deployment.go      | 2 +-
 pkg/trait/knative_service.go | 2 +-
 pkg/trait/prometheus.go      | 2 +-
 pkg/trait/trait_types.go     | 4 +---
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkg/trait/cron.go b/pkg/trait/cron.go
index 98707f4..3f740b1 100644
--- a/pkg/trait/cron.go
+++ b/pkg/trait/cron.go
@@ -194,7 +194,7 @@ func (t *cronTrait) Configure(e *Environment) (bool, error) 
{
        }
 
        // CronJob strategy requires common schedule
-       strategy, err := e.DetermineControllerStrategy(t.Ctx, t.Client)
+       strategy, err := e.DetermineControllerStrategy()
        if err != nil {
                e.Integration.Status.SetErrorCondition(
                        v1.IntegrationConditionCronJobAvailable,
diff --git a/pkg/trait/deployment.go b/pkg/trait/deployment.go
index 985fd97..a56ec06 100644
--- a/pkg/trait/deployment.go
+++ b/pkg/trait/deployment.go
@@ -63,7 +63,7 @@ func (t *deploymentTrait) Configure(e *Environment) (bool, 
error) {
        //
        // Don't deploy when a different strategy is needed (e.g. Knative, Cron)
        //
-       strategy, err := e.DetermineControllerStrategy(t.Ctx, t.Client)
+       strategy, err := e.DetermineControllerStrategy()
        if err != nil {
                e.Integration.Status.SetErrorCondition(
                        v1.IntegrationConditionDeploymentAvailable,
diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go
index 8bbe95c..bea1513 100644
--- a/pkg/trait/knative_service.go
+++ b/pkg/trait/knative_service.go
@@ -121,7 +121,7 @@ func (t *knativeServiceTrait) Configure(e *Environment) 
(bool, error) {
                return false, nil
        }
 
-       strategy, err := e.DetermineControllerStrategy(t.Ctx, t.Client)
+       strategy, err := e.DetermineControllerStrategy()
        if err != nil {
                e.Integration.Status.SetErrorCondition(
                        v1.IntegrationConditionKnativeServiceAvailable,
diff --git a/pkg/trait/prometheus.go b/pkg/trait/prometheus.go
index 03b89f7..9beeb2c 100644
--- a/pkg/trait/prometheus.go
+++ b/pkg/trait/prometheus.go
@@ -123,7 +123,7 @@ func (t *prometheusTrait) Apply(e *Environment) (err error) 
{
 
        // Configure the Prometheus container port
        containerPort := t.getContainerPort()
-       controller, err := e.DetermineControllerStrategy(t.Ctx, t.Client)
+       controller, err := e.DetermineControllerStrategy()
        if err != nil {
                return err
        }
diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go
index e3c8c46..6352c7a 100644
--- a/pkg/trait/trait_types.go
+++ b/pkg/trait/trait_types.go
@@ -28,8 +28,6 @@ import (
        "github.com/apache/camel-k/pkg/util"
        corev1 "k8s.io/api/core/v1"
        metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-       controller "sigs.k8s.io/controller-runtime/pkg/client"
-
        "k8s.io/apimachinery/pkg/runtime"
 
        v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
@@ -298,7 +296,7 @@ func (e *Environment) DetermineProfile() v1.TraitProfile {
 }
 
 // DetermineControllerStrategy determines the type of controller that should 
be used for the integration
-func (e *Environment) DetermineControllerStrategy(ctx context.Context, c 
controller.Reader) (ControllerStrategy, error) {
+func (e *Environment) DetermineControllerStrategy() (ControllerStrategy, 
error) {
        defaultStrategy := DefaultControllerStrategy
        for _, creator := range e.getControllerStrategyChoosers() {
                if strategy, err := creator.SelectControllerStrategy(e); err != 
nil {

Reply via email to