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 ce2fa65a51b1ec8b839e2774e91722ac44f09c19
Author: Antonin Stefanutti <[email protected]>
AuthorDate: Tue Jun 2 15:21:53 2020 +0200

    chore: Remove deployer traits member leftovers
---
 pkg/trait/cron.go            |  7 +------
 pkg/trait/deployment.go      | 17 +----------------
 pkg/trait/deployment_test.go |  1 -
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/pkg/trait/cron.go b/pkg/trait/cron.go
index 853e682..98707f4 100644
--- a/pkg/trait/cron.go
+++ b/pkg/trait/cron.go
@@ -75,8 +75,7 @@ type cronTrait struct {
        //
        // It's required that all periodic consumers have the same period and 
it can be expressed as cron schedule (e.g. `1m` can be expressed as `0/1 * * * 
*`,
        // while `35m` or `50s` cannot).
-       Auto     *bool `property:"auto"`
-       deployer deployerTrait
+       Auto *bool `property:"auto"`
 }
 
 var _ ControllerStrategySelector = &cronTrait{}
@@ -180,10 +179,6 @@ func (t *cronTrait) Configure(e *Environment) (bool, 
error) {
                        }
                }
        }
-       dt := e.Catalog.GetTrait("deployer")
-       if dt != nil {
-               t.deployer = *dt.(*deployerTrait)
-       }
 
        // Fallback strategy can be implemented in any other controller
        if t.Fallback != nil && *t.Fallback {
diff --git a/pkg/trait/deployment.go b/pkg/trait/deployment.go
index 088a721..985fd97 100644
--- a/pkg/trait/deployment.go
+++ b/pkg/trait/deployment.go
@@ -33,7 +33,6 @@ import (
 // +camel-k:trait=deployment
 type deploymentTrait struct {
        BaseTrait `property:",squash"`
-       deployer  deployerTrait
 }
 
 var _ ControllerStrategySelector = &deploymentTrait{}
@@ -85,15 +84,7 @@ func (t *deploymentTrait) Configure(e *Environment) (bool, 
error) {
                return false, nil
        }
 
-       enabled := e.IntegrationInPhase(v1.IntegrationPhaseDeploying)
-       if enabled {
-               dt := e.Catalog.GetTrait("deployer")
-               if dt != nil {
-                       t.deployer = *dt.(*deployerTrait)
-               }
-       }
-
-       return enabled, nil
+       return e.IntegrationInPhase(v1.IntegrationPhaseDeploying), nil
 }
 
 func (t *deploymentTrait) SelectControllerStrategy(e *Environment) 
(*ControllerStrategy, error) {
@@ -146,12 +137,6 @@ func (t *deploymentTrait) IsPlatformTrait() bool {
        return true
 }
 
-// **********************************
-//
-// Deployment
-//
-// **********************************
-
 func (t *deploymentTrait) getDeploymentFor(e *Environment) *appsv1.Deployment {
        // create a copy to avoid sharing the underlying annotation map
        annotations := make(map[string]string)
diff --git a/pkg/trait/deployment_test.go b/pkg/trait/deployment_test.go
index a20293f..9798e72 100644
--- a/pkg/trait/deployment_test.go
+++ b/pkg/trait/deployment_test.go
@@ -68,7 +68,6 @@ func TestConfigureDeploymentTraitDoesSucceed(t *testing.T) {
 
        assert.Nil(t, err)
        assert.True(t, configured)
-       assert.NotNil(t, deploymentTrait.deployer)
 }
 
 func TestConfigureDeploymentTraitWhileBuildingKitDoesNotSucceed(t *testing.T) {

Reply via email to